Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cast enums to target enums before assigning them 

* Cast enum pointers to target type rather than just assigning them


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3611 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-01-30 23:35:13 +00:00
parent ecd9c26df9
commit 8c06eaaad7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/multiplay.c
View File

@ -1357,7 +1357,7 @@ BOOL sendTemplate(DROID_TEMPLATE *pTempl)
NETuint32_t(&pTempl->asWeaps[i]); NETuint32_t(&pTempl->asWeaps[i]);
} }
NETuint32_t(&pTempl->droidType); NETuint32_t((uint32_t*)&pTempl->droidType);
NETuint32_t(&pTempl->multiPlayerID); NETuint32_t(&pTempl->multiPlayerID);
return NETend(); return NETend();
@ -1395,7 +1395,7 @@ BOOL recvTemplate()
NETuint32_t(&pT->asWeaps[i]); NETuint32_t(&pT->asWeaps[i]);
} }
NETuint32_t(&pT->droidType); NETuint32_t((uint32_t*)&pT->droidType);
NETuint32_t(&pT->multiPlayerID); NETuint32_t(&pT->multiPlayerID);
NETend(); NETend();

2
src/scriptfuncs.c
View File

@ -11287,7 +11287,7 @@ BOOL scrGetTileStructure(void)
} }
scrFunctionResult.v.oval = getTileStructure(structureX, structureY); 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"); debug(LOG_ERROR, "scrGetTileStructure(): failed to push result");
return FALSE; return FALSE;

2
src/scriptobj.c
View File

@ -789,7 +789,7 @@ BOOL scrGroupObjGet(UDWORD index)
scrFunctionResult.v.ival = psGroup->type; scrFunctionResult.v.ival = psGroup->type;
break; break;
case GROUPID_CMD: case GROUPID_CMD:
type = ST_DROID; type = (INTERP_TYPE)ST_DROID;
scrFunctionResult.v.oval = psGroup->psCommander; scrFunctionResult.v.oval = psGroup->psCommander;
break; break;
default: default:

2
src/scripttabs.c
View File

@ -1399,7 +1399,7 @@ FUNC_SYMBOL asFuncTable[] =
3, { VAL_INT, VAL_INT, VAL_INT }, 3, { VAL_INT, VAL_INT, VAL_INT },
0, 0, NULL, 0, 0, NULL, NULL }, 0, 0, NULL, 0, 0, NULL, NULL },
{ "getTileStructure", scrGetTileStructure, ST_STRUCTURE, { "getTileStructure", scrGetTileStructure, (INTERP_TYPE)ST_STRUCTURE,
2, { VAL_INT, VAL_INT }, 2, { VAL_INT, VAL_INT },
0, 0, NULL, 0, 0, NULL, NULL }, 0, 0, NULL, 0, 0, NULL, NULL },