hedgewars-draft: comparison project_files/frontlib/net/netconn.c

equal deleted inserted replaced

-:c8c552ee3acb
+:d70a5b0d1190
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
-// TODO: Check the state transitions. Document with a diagram or something
 #include "netconn_internal.h"
 #include "netprotocol.h"
 #include "../util/logging.h"
 #include "../util/util.h"
 #include "../md5/md5.h"
 			newConn->pendingTeamlist.teamCount = 0;
 			newConn->pendingTeamlist.teams = NULL;
 			newConn->teamlist.teamCount = 0;
 			newConn->teamlist.teams = NULL;
 			newConn->scheme = NULL;
-			newConn->script = NULL;
+			newConn->style = NULL;
 			newConn->weaponset = NULL;
 			newConn->running = false;
 			newConn->destroyRequested = false;
 			netconn_clearCallbacks(newConn);
 			free(conn->playerName);
 			free(conn->dataDirPath);
 			flib_metascheme_release(conn->metaCfg);
-			flib_map_release(conn->map);
+			flib_map_destroy(conn->map);
 			flib_teamlist_clear(&conn->pendingTeamlist);
 			flib_teamlist_clear(&conn->teamlist);
-			flib_scheme_release(conn->scheme);
+			flib_scheme_destroy(conn->scheme);
-			free(conn->script);
+			free(conn->style);
 			flib_weaponset_release(conn->weaponset);
 			free(conn);
 		}
 	}
 }
 bool flib_netconn_is_chief(flib_netconn *conn) {
-	if(!log_badargs_if(conn==NULL) && flib_netconn_is_in_room_context(conn)) {
+	if(!log_badargs_if(conn==NULL) && conn->netconnState==NETCONN_STATE_ROOM) {
 		return conn->isChief;
 	}
 	return false;
 }
 }
 void netconn_leaveRoom(flib_netconn *conn) {
 	conn->netconnState = NETCONN_STATE_LOBBY;
 	conn->isChief = false;
-	flib_map_release(conn->map);
+	flib_map_destroy(conn->map);
 	conn->map = flib_map_create_named("", "NoSuchMap");
 	flib_teamlist_clear(&conn->pendingTeamlist);
 	flib_teamlist_clear(&conn->teamlist);
-	flib_scheme_release(conn->scheme);
+	flib_scheme_destroy(conn->scheme);
 	conn->scheme = NULL;
-	free(conn->script);
+	free(conn->style);
-	conn->script = NULL;
+	conn->style = NULL;
 	flib_weaponset_release(conn->weaponset);
 	conn->weaponset = NULL;
-}
-bool flib_netconn_is_in_room_context(flib_netconn *conn) {
-	return conn && (conn->netconnState == NETCONN_STATE_ROOM || conn->netconnState == NETCONN_STATE_INGAME);
 }
 void netconn_setMap(flib_netconn *conn, const flib_map *map) {
 	flib_map *copy = flib_map_copy(map);
 	if(copy) {
-		flib_map_release(conn->map);
+		flib_map_destroy(conn->map);
 		conn->map = copy;
 	}
 }
 void netconn_setWeaponset(flib_netconn *conn, const flib_weaponset *weaponset) {
 }
 void netconn_setScript(flib_netconn *conn, const char *script) {
 	char *copy = flib_strdupnull(script);
 	if(copy) {
-		free(conn->script);
+		free(conn->style);
-		conn->script = copy;
+		conn->style = copy;
 	}
 }
 void netconn_setScheme(flib_netconn *conn, const flib_scheme *scheme) {
 	flib_scheme *copy = flib_scheme_copy(scheme);
 	if(copy) {
-		flib_scheme_release(conn->scheme);
+		flib_scheme_destroy(conn->scheme);
 		conn->scheme = copy;
 	}
 }
 flib_gamesetup *flib_netconn_create_gamesetup(flib_netconn *conn) {
 			flib_log_e("Incomplete room state");
 		} else {
 			flib_gamesetup stackSetup = {0};
 			stackSetup.gamescheme = conn->scheme;
 			stackSetup.map = conn->map;
-			stackSetup.script = conn->script;
+			stackSetup.style = conn->style;
 			stackSetup.teamlist = &conn->teamlist;
 			flib_gamesetup *tmpSetup = flib_gamesetup_copy(&stackSetup);
 			if(tmpSetup) {
 				for(int i=0; i<tmpSetup->teamlist->teamCount; i++) {
 					flib_team_set_weaponset(tmpSetup->teamlist->teams[i], conn->weaponset);
 						break;
 					}
 				}
 	        }
 	    } else if (!strcmp(cmd, "ADD_TEAM")) {
-	        if(netmsg->partCount != 24 || !flib_netconn_is_in_room_context(conn)) {
+	        if(netmsg->partCount != 24 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad ADD_TEAM message");
 	        } else {
 	        	flib_team *team = flib_team_from_netmsg(netmsg->parts+1);
 	        	if(!team || flib_teamlist_insert(&conn->teamlist, team, conn->teamlist.teamCount)) {
 					flib_team_destroy(team);
 	        		team->remoteDriven = true;
 	        		conn->onTeamAddCb(conn->onTeamAddCtx, team);
 	        	}
 	        }
 	    } else if (!strcmp(cmd, "REMOVE_TEAM")) {
-	        if(netmsg->partCount != 2 || !flib_netconn_is_in_room_context(conn)) {
+	        if(netmsg->partCount != 2 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad REMOVETEAM message");
 	        } else {
 	        	flib_teamlist_delete(&conn->teamlist, netmsg->parts[1]);
 	        	conn->onTeamDeleteCb(conn->onTeamDeleteCtx, netmsg->parts[1]);
 	        }
 	            flib_log_w("Net: Bad LOBBY:LEFT message");
 	        } else {
 	        	conn->onLobbyLeaveCb(conn->onLobbyLeaveCtx, netmsg->parts[1], netmsg->partCount>2 ? netmsg->parts[2] : NULL);
 	        }
 	    } else if (!strcmp(cmd, "RUN_GAME")) {
-	        conn->netconnState = NETCONN_STATE_INGAME;
-	        // TODO send along the config
 	        conn->onRunGameCb(conn->onRunGameCtx);
 	    } else if (!strcmp(cmd, "ASKPASSWORD")) {
 	    	conn->onPasswordRequestCb(conn->onPasswordRequestCtx, conn->playerName);
 	    } else if (!strcmp(cmd, "NOTICE")) {
 	        if(netmsg->partCount < 2) {
 				} else {
 					flib_log_w("Net: Unknown NOTICE message: %l", n);
 				}
 	        }
 	    } else if (!strcmp(cmd, "TEAM_ACCEPTED")) {
-	        if (netmsg->partCount != 2 || !flib_netconn_is_in_room_context(conn)) {
+	        if (netmsg->partCount != 2 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad TEAM_ACCEPTED message");
 	        } else {
-	        	flib_team *team = flib_teamlist_find(&conn->pendingTeamlist, netmsg->parts[1]);
+	        	flib_team *team = flib_team_copy(flib_teamlist_find(&conn->pendingTeamlist, netmsg->parts[1]));
 	        	if(team) {
 	        		flib_teamlist_insert(&conn->teamlist, team, conn->teamlist.teamCount);
 	        		flib_teamlist_delete(&conn->pendingTeamlist, netmsg->parts[1]);
 	        	} else {
 	        		flib_log_e("Team accepted that was not requested: %s", netmsg->parts[1]);
 	        	}
 	        	conn->onTeamAcceptedCb(conn->onTeamAcceptedCtx, netmsg->parts[1]);
 	        }
 	    } else if (!strcmp(cmd, "CFG")) {
-	        if(netmsg->partCount < 3 || !flib_netconn_is_in_room_context(conn)) {
+	        if(netmsg->partCount < 3 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad CFG message");
 	        } else {
 	        	const char *subcmd = netmsg->parts[1];
 				if(!strcmp(subcmd, "SCHEME") && netmsg->partCount == conn->metaCfg->modCount + conn->metaCfg->settingCount + 3) {
-					flib_scheme *cfg = flib_netmsg_to_cfg(conn->metaCfg, netmsg->parts+2);
+					flib_scheme *cfg = flib_scheme_from_netmsg(conn->metaCfg, netmsg->parts+2);
 					if(cfg) {
-						netconn_setScheme(conn, cfg);
+						flib_scheme_destroy(conn->scheme);
+						conn->scheme = cfg;
 						conn->onCfgSchemeCb(conn->onCfgSchemeCtx, cfg);
 					} else {
 						flib_log_e("Error processing CFG SCHEME message");
 					}
-					flib_scheme_release(cfg);
 				} else if(!strcmp(subcmd, "FULLMAPCONFIG") && netmsg->partCount == 7) {
-					flib_map *map = flib_netmsg_to_map(netmsg->parts+2);
+					flib_map *map = flib_map_from_netmsg(netmsg->parts+2);
 					if(map) {
-						netconn_setMap(conn, map);
+						flib_map_destroy(conn->map);
+						conn->map = map;
 						conn->onMapChangedCb(conn->onMapChangedCtx, conn->map, NETCONN_MAPCHANGE_FULL);
 					} else {
 						flib_log_e("Error processing CFG FULLMAPCONFIG message");
 					}
-					flib_map_release(map);
 				} else if(!strcmp(subcmd, "MAP") && netmsg->partCount == 3) {
 					char *mapname = flib_strdupnull(netmsg->parts[2]);
 					if(mapname) {
 						free(conn->map->name);
 						conn->map->name = mapname;
 					conn->map->mazeSize = atoi(netmsg->parts[2]);
 					conn->onMapChangedCb(conn->onMapChangedCtx, conn->map, NETCONN_MAPCHANGE_MAZE_SIZE);
 				} else if(!strcmp(subcmd, "DRAWNMAP") && netmsg->partCount == 3) {
 					size_t drawnMapSize = 0;
 					uint8_t *drawnMapData = NULL;
-					if(!flib_netmsg_to_drawnmapdata(netmsg->parts[2], &drawnMapData, &drawnMapSize)) {
+					if(!flib_drawnmapdata_from_netmsg(netmsg->parts[2], &drawnMapData, &drawnMapSize)) {
 						free(conn->map->drawData);
 						conn->map->drawData = drawnMapData;
 						conn->map->drawDataSize = drawnMapSize;
 						conn->onMapChangedCb(conn->onMapChangedCtx, conn->map, NETCONN_MAPCHANGE_DRAWNMAP);
 					} else {
 				} else {
 					flib_log_w("Net: Unknown or malformed CFG subcommand: %s", subcmd);
 				}
 	        }
 	    } else if (!strcmp(cmd, "HH_NUM")) {
-	        if (netmsg->partCount != 3 || !flib_netconn_is_in_room_context(conn)) {
+	        if (netmsg->partCount != 3 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad HH_NUM message");
 	        } else {
 	        	int hogs = atoi(netmsg->parts[2]);
 	        	if(hogs<=0 || hogs>HEDGEHOGS_PER_TEAM) {
 	        		flib_log_w("Net: Bad HH_NUM message: %s hogs", netmsg->parts[2]);
 	        		}
 	        		conn->onHogCountChangedCb(conn->onHogCountChangedCtx, netmsg->parts[1], hogs);
 	        	}
 	        }
 	    } else if (!strcmp(cmd, "TEAM_COLOR")) {
-	        if (netmsg->partCount != 3 || !flib_netconn_is_in_room_context(conn)) {
+	        if (netmsg->partCount != 3 || conn->netconnState!=NETCONN_STATE_ROOM) {
 	            flib_log_w("Net: Bad TEAM_COLOR message");
 	        } else {
 	        	long color;
-	        	if(sscanf(netmsg->parts[2], "%lu", &color) && color>=0 && color<flib_teamcolor_defaults_len) {
+	        	if(sscanf(netmsg->parts[2], "%lu", &color) && color>=0 && color<flib_teamcolor_count) {
 	        		flib_team *team = flib_teamlist_find(&conn->teamlist, netmsg->parts[1]);
 	        		if(team) {
 	        			team->colorIndex = color;
 	        		} else {
 	        			flib_log_e("TEAM_COLOR message for unknown team %s", netmsg->parts[1]);

changeset 7482	d70a5b0d1190
parent 7338	1ed603a54ebd
child 7497	7e1d72fc03c7