diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:26:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:26:10 (GMT) |
| commit | a27074fc473cafc1f7179da0bfac98e6da1e7449 (patch) | |
| tree | efc35b74dbf8060a565646dc4337bd956355ce9f /src | |
| parent | ea619f554259d746a82c2abf45e5734f637ed041 (diff) | |
| download | powder-a27074fc473cafc1f7179da0bfac98e6da1e7449.zip powder-a27074fc473cafc1f7179da0bfac98e6da1e7449.tar.gz | |
Revert "Some fixes for compiling with Visual Studio - void* and inline"
This reverts commit ea619f554259d746a82c2abf45e5734f637ed041.
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 2 | ||||
| -rw-r--r-- | src/luaconsole.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/graphics.c b/src/graphics.c index b476cf1..aa72139 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -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__) -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 inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) #endif diff --git a/src/luaconsole.c b/src/luaconsole.c index c9291ae..65bda4d 100644 --- a/src/luaconsole.c +++ b/src/luaconsole.c @@ -1168,9 +1168,9 @@ int luatpt_set_property(lua_State* l) } i = r>>8; if(format==2){ - *((float*)(((char*)&parts[i])+offset)) = f; + *((float*)(((void*)&parts[i])+offset)) = f; } else { - *((int*)(((char*)&parts[i])+offset)) = t; + *((int*)(((void*)&parts[i])+offset)) = t; } } } else { @@ -1192,9 +1192,9 @@ int luatpt_set_property(lua_State* l) if (partsel && partsel != parts[i].type) return 0; if(format==2){ - *((float*)(((char*)&parts[i])+offset)) = f; + *((float*)(((void*)&parts[i])+offset)) = f; } else { - *((int*)(((char*)&parts[i])+offset)) = t; + *((int*)(((void*)&parts[i])+offset)) = t; } } return 0; |