Update of /cvsroot/netrek/client/netrekxp/src
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28207/src
Modified Files:
enter.c socket.c
Log Message:
Bug fix: Paradise team logos were not initiliazed before they were freed during
game paramamter packet recepit.
Index: enter.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- enter.c 16 Jul 2008 00:16:10 -0000 1.19
+++ enter.c 1 Oct 2010 02:08:33 -0000 1.20
@@ -54,6 +54,7 @@
initialize_plasmas();
initialize_phasers();
load_default_teams();
+ load_default_teamlogos();
initialize_thingies();
status2 = (struct status2 *) malloc(sizeof(*status2));
status = (struct status *) malloc(sizeof(*status));
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- socket.c 24 Jun 2009 00:52:22 -0000 1.77
+++ socket.c 1 Oct 2010 02:08:33 -0000 1.78
@@ -3760,6 +3760,23 @@
strcpy(teaminfo[4].shortname, "ALL");
}
+void
+load_default_teamlogos(void)
+{
+ int i = number_of_teams;
+
+ switch (i) { /* TODO: add actual logos */
+ case 4:
+ teaminfo[3].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w);
+ case 3:
+ teaminfo[2].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w);
+ case 2:
+ teaminfo[1].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w);
+ case 1:
+ teaminfo[0].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w);
+ }
+}
+
load_generic_teams(void)
{
/* needs to be converted to xpm */
@@ -3775,7 +3792,7 @@
teaminfo[-1].letter = 'I';
strcpy(teaminfo[-1].shortname, "IND");
-// load_default_teamlogos(); /* loads the first 4 team logos */
+ load_default_teamlogos(); /* loads the first 4 team logos */
for (i = 0; i < number_of_teams; i++) {
sprintf(teaminfo[i].name, "Team #%d", i);
_______________________________________________
netrek-cvs mailing list
[email protected]
http://mailman.us.netrek.org/mailman/listinfo/netrek-cvs
