Hello again,
1. It might not be the best of ideas to call a file "png.h" when
includes don't use path names. The current trunk doesn't compile for me,
it can't find /usr/include/png.h because of lib/ivis_common/png.h. A
fast fix is to include /usr/include/png.h in lib/ivis_common/png.c.
2. gcc 4.2 complains about "audp_lval.sval[audp_leng-2] = (char) NULL;"
in lib/gamelib/audp_lexer.l". I've attached a patch to fix it, but
perhaps there's a better solution than just changing the cast to a 0.
3. g++ doesn't like "template" as a variable name and wants a few casts.
Patch attached.
=== lib/gamelib/audp_lexer.l
==================================================================
--- lib/gamelib/audp_lexer.l (revision 1294)
+++ lib/gamelib/audp_lexer.l (local)
@@ -101,7 +101,7 @@
}
/* set final quote in string to blank */
- audp_lval.sval[audp_leng-2] = (char) NULL;
+ audp_lval.sval[audp_leng-2] = 0;
return QTEXT;
}
=== src/design.c
==================================================================
--- src/design.c (revision 1294)
+++ src/design.c (local)
@@ -3542,17 +3542,17 @@
}
// work out current system component
-static UDWORD getSystemType(DROID_TEMPLATE* template)
+static UDWORD getSystemType(DROID_TEMPLATE* droid_template)
{
- if (template->asParts[COMP_ECM]) {
+ if (droid_template->asParts[COMP_ECM]) {
return COMP_ECM;
- } else if (template->asParts[COMP_SENSOR]) {
+ } else if (droid_template->asParts[COMP_SENSOR]) {
return COMP_SENSOR;
- } else if (template->asParts[COMP_CONSTRUCT]) {
+ } else if (droid_template->asParts[COMP_CONSTRUCT]) {
return COMP_CONSTRUCT;
- } else if (template->asParts[COMP_REPAIRUNIT]) {
+ } else if (droid_template->asParts[COMP_REPAIRUNIT]) {
return COMP_REPAIRUNIT;
- } else if (template->asWeaps[0]) {
+ } else if (droid_template->asWeaps[0]) {
return COMP_WEAPON;
} else {
// compare it with the current weapon
=== src/mapgrid.c
==================================================================
--- src/mapgrid.c (revision 1294)
+++ src/mapgrid.c (local)
@@ -285,7 +285,7 @@
// get the next object that could affect a location,
// should only be called after gridStartIterate
-inline BASE_OBJECT *gridIterate(void)
+BASE_OBJECT *gridIterate(void)
{
BASE_OBJECT *psRet;
=== src/scriptfuncs.c
==================================================================
--- src/scriptfuncs.c (revision 1294)
+++ src/scriptfuncs.c (local)
@@ -10992,7 +10992,7 @@
}
scrFunctionResult.v.oval = getTileStructure(structureX, structureY);
- if (!stackPushResult(ST_STRUCTURE, &scrFunctionResult))
+ if (!stackPushResult((INTERP_TYPE)ST_STRUCTURE, &scrFunctionResult))
{
debug(LOG_ERROR, "scrGetTileStructure(): failed to push result");
return FALSE;
=== src/scripttabs.c
==================================================================
--- src/scripttabs.c (revision 1294)
+++ src/scripttabs.c (local)
@@ -1364,7 +1364,7 @@
3, { VAL_INT, VAL_INT, VAL_INT },
0, 0, NULL, 0, 0, NULL, NULL },
- { "getTileStructure", scrGetTileStructure, ST_STRUCTURE,
+ { "getTileStructure", scrGetTileStructure, (INTERP_TYPE)ST_STRUCTURE,
2, { VAL_INT, VAL_INT },
0, 0, NULL, 0, 0, NULL, NULL },
_______________________________________________
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
