File squaroid-0.60.3-gcc4.diff of Package squaroid

--- plugins/xhigh/xhigh.c
+++ plugins/xhigh/xhigh.c
@@ -38,7 +38,7 @@
 	GtkWidget *frame, *frame_box, *button;
 	
 	if (!XHIGH)
-		XHIGH = game_alloc(game, sizeof(XHighData));
+		this->data = game_alloc(game, sizeof(XHighData));
 	if (!XHIGH)
 		fprintf(stderr, "[XHIGH] FATAL ERROR: no plugindata\n");
 
@@ -107,7 +107,7 @@
 	else if (XHIGH->mode == MODE_16HIGH)
 		game_chatmessage(game, STARTOFF " Only squares with a value of \0035 16 or less \003 are counted\n");
 		
-	XHIGH = 0;
+	this->data = 0;
 	return PLUGIN_SUCCESS;
 }
 
@@ -149,9 +149,9 @@
 			return;
 		}
 	
-	XHIGH = game->plugindata;              /* restore the pointer! */
+	this->data = game->plugindata;              /* restore the pointer! */
 	if (XHIGH == 0)
-		XHIGH = game_alloc(game, sizeof(XHighData));
+		this->data = game_alloc(game, sizeof(XHighData));
 	
 	XHIGH->mode = atoi(data->list[1]);
 	fprintf(stderr, "[XHIGH] mode set to %d\n", XHIGH->mode);
--- src/netclient.c
+++ src/netclient.c
@@ -864,7 +864,7 @@
 					game->options.timeout = atoi(data->list[2]);
 					game->movelimit.time_max = atoi(data->list[3]);
 					game->e_opponent->lag = atoi(data->list[4]);
-					GAME_PLUGIN(game) = sq_plugin_find_by_name(data->list[5]);
+					game->options.plugin = sq_plugin_find_by_name(data->list[5]);
 					chatroom_debugmessage(" INVITE [player=%d] [timeout=%d] "
 																"[time_max=%d]\n",
 																game->options.first_player,