matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Some fixes for compiling with Visual Studio - void* and inline"

Browse Source 
This reverts commit ea619f5542.
This commit is contained in:
Simon Robertshaw 2012-01-25 13:26:10 +00:00
parent ea619f5542
commit a27074fc47
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics.c
View File

@ -888,7 +888,7 @@ inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
} }
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN32) && !defined(__GNUC__)
int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) _inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
#else #else
inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
#endif #endif

8
src/luaconsole.c
View File

@ -1168,9 +1168,9 @@ int luatpt_set_property(lua_State* l)
} }
i = r>>8; i = r>>8;
if(format==2){ if(format==2){
*((float*)(((char*)&parts[i])+offset)) = f; *((float*)(((void*)&parts[i])+offset)) = f;
} else { } else {
*((int*)(((char*)&parts[i])+offset)) = t; *((int*)(((void*)&parts[i])+offset)) = t;
} }
} }
} else { } else {
@ -1192,9 +1192,9 @@ int luatpt_set_property(lua_State* l)
if (partsel && partsel != parts[i].type) if (partsel && partsel != parts[i].type)
return 0; return 0;
if(format==2){ if(format==2){
*((float*)(((char*)&parts[i])+offset)) = f; *((float*)(((void*)&parts[i])+offset)) = f;
} else { } else {
*((int*)(((char*)&parts[i])+offset)) = t; *((int*)(((void*)&parts[i])+offset)) = t;
} }
} }
return 0; return 0;