hedgewars-draft: comparison project_files/cmdlineClient/cmdlineClient.c

equal deleted inserted replaced

-:0db1780ca938
+:45b9f25ff611
 #include <frontlib.h>
 #include <util/logging.h>
 #include <util/util.h>
 #include <base64/base64.h>
+#include <model/schemelist.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <assert.h>
 #include <string.h>
 static flib_netconn *netconn;
 static flib_gameconn *gameconn;
 static flib_mapconn *mapconn;
 static char nickname[128];
-static flib_cfg_meta *metacfg;
+static flib_metascheme *metacfg;
 static bool netConnected = false;
 // Callback function that will be called when the map is rendered
 static void handleMapGenerated(void *context, const uint8_t *bitmap, int numHedgehogs) {
 	printf("Drawing map for %i brave little hogs...", numHedgehogs);
 	printf("Disconnected: %s", message);
 	flib_netconn_destroy(netconn);
 	netconn = NULL;
 }
-void printRoomList() {
+/*void printRoomList() {
 	const flib_roomlist *roomlist = flib_netconn_get_roomlist(netconn);
 	if(roomlist) {
 		if(roomlist->roomCount>0) {
 			for(int i=0; i<roomlist->roomCount; i++) {
 				if(i>0) {
 		}
 	} else {
 		puts("Sorry, due to an error the room list is not available.");
 	}
 	puts("\n");
-}
+}*/
 void printTeamList() {
 	flib_gamesetup *setup = flib_netconn_create_gamesetup(netconn);
 	if(setup) {
 		puts("The following teams are in this room:");
 	flib_gamesetup_destroy(setup);
 }
 void handleNetConnected(void *context) {
 	printf("You enter the lobby of a strange house inhabited by hedgehogs. Looking around, you see hallways branching off to these rooms:\n");
-	printRoomList();
+	//printRoomList();
 	printf("\n\nNow, you can chat by just entering text, or join a room with /join <roomname>.");
 	printf(" You can also /quit or let me /describe <roomname>. Once in a room, you can /add <teamname> and set yourself /ready. You can also /list the available rooms (in the lobby) or the teams (in a room).\n");
 	netConnected = true;
 }
 		printf(" (%s)", msg);
 	}
 	puts(" You are back in the lobby.");
 }
-void handleSchemeChanged(void *context, flib_cfg *scheme) {
+void handleSchemeChanged(void *context, const flib_scheme *scheme) {
 	printf("Game scheme: %s.\n", scheme->name);
 }
-void handleWeaponsetChanged(void *context, flib_weaponset *weaponset) {
+void handleWeaponsetChanged(void *context, const flib_weaponset *weaponset) {
 	printf("Weaponset: %s.\n", weaponset->name);
 }
 void handleHogcountChanged(void *context, const char *team, int count) {
 	printf("Team %s will send %i hogs into the fight.\n", team, count);
 void handleScriptChanged(void *context, const char *script) {
 	printf("Game Type: %s\n", script);
 }
-void handleTeamAdd(void *context, flib_team *team) {
+void handleTeamAdd(void *context, const flib_team *team) {
 	printf("%s puts the team %s to the planning board.\n", team->ownerName, team->name);
 }
 void handleTeamDelete(void *context, const char *teamName) {
 	printf("The team %s decided not to fight this battle after all.\n", teamName);
 	}
 	if(!flib_init(0)) {
 		flib_log_setLevel(FLIB_LOGLEVEL_WARNING);
 		freopen( "CON", "w", stdout );
 		freopen( "CON", "w", stderr );
-		metacfg = flib_cfg_meta_from_ini("metasettings.ini");
+		metacfg = flib_metascheme_from_ini("metasettings.ini");
 		if(!metacfg) {
 			flib_quit();
 			return -1;
 		} else {
 			return 0;
 					if(!flib_gets(input, sizeof(input))) {
 						if(!memcmp("/quit", input, strlen("/quit"))) {
 							flib_netconn_send_quit(netconn, "Player quit.");
 						} else if(!memcmp("/describe ", input, strlen("/describe "))) {
 							const char *roomname = input+strlen("/describe ");
-							const flib_roomlist *roomlist = flib_netconn_get_roomlist(netconn);
+							/*const flib_roomlist *roomlist = flib_netconn_get_roomlist(netconn);
 							flib_room *room = flib_roomlist_find(roomlist, roomname);
 							if(!room) {
 								puts("Unknown room.");
 							} else {
 								char *text = flib_asprintf(
 										room->weapons);
 								if(text) {
 									puts(text);
 								}
 								free(text);
-							}
+							}*/
 						} else if(!memcmp("/join ", input, strlen("/join "))) {
 							const char *roomname = input+strlen("/join ");
 							flib_netconn_send_joinRoom(netconn, roomname);
 						} else if(!memcmp("/ready", input, strlen("/ready"))) {
 							flib_netconn_send_toggleReady(netconn);
 						} else if(!memcmp("/list", input, strlen("/list"))) {
 							if(flib_netconn_is_in_room_context(netconn)) {
 								printTeamList();
 							} else {
 								puts("From this big and expansive lobby, hallways branch off to these rooms:");
-								printRoomList();
+								//printRoomList();
 							}
 						} else if(!memcmp("/addteam ", input, strlen("/addteam "))) {
 							const char *teamname = input+strlen("/addteam ");
 							if(!flib_contains_dir_separator(teamname)) {
 								char *teamfilename = flib_asprintf("%s.hwt", teamname);
 									if(team) {
 										flib_netconn_send_addTeam(netconn, team);
 									} else {
 										printf("Teamfile %s not found.\n", teamfilename);
 									}
-									flib_team_release(team);
+									flib_team_destroy(team);
 								}
 								free(teamfilename);
 							}
 						} else if(strlen(input)>0) {
 							flib_netconn_send_chat(netconn, input);
 		fflush(stdout);
 		Sleep(10);
 	}
-	flib_cfg_meta_release(metacfg);
+	flib_metascheme_release(metacfg);
 	return 0;
 }

changeset 7473	45b9f25ff611
parent 7340	62043f5f7c67
child 7488	7e09947b6aa5