From 3edb391f9c032e6259eb8c64416240225c17dbef Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 5 Dec 2017 08:59:20 +0100 Subject: [PATCH 1/6] fix file modes --- premake5.lua | 0 src/base.cpp | 0 src/camera.cpp | 0 src/d3d/d3ddevice.cpp | 0 src/engine.cpp | 0 src/gl/gl3device.cpp | 0 src/matfx.cpp | 0 src/pipeline.cpp | 0 src/ps2/pds.cpp | 0 src/ps2/ps2.cpp | 0 src/ps2/ps2device.cpp | 0 src/ps2/rwps2.h | 0 src/rwengine.h | 0 src/rwobjects.h | 0 src/rwplugins.h | 0 src/world.cpp | 0 tools/ps2test/gs.h | 0 tools/ps2test/main.cpp | 0 tools/ps2test/mem.h | 0 tools/ps2test/ps2.h | 0 tools/ps2test/vu/defaultpipe.dsm | 0 tools/ps2test/vu/light.vu | 0 tools/ps2test/vu/setup_persp.vu | 0 tools/ps2test/vu/skinpipe.dsm | 0 24 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 premake5.lua mode change 100755 => 100644 src/base.cpp mode change 100755 => 100644 src/camera.cpp mode change 100755 => 100644 src/d3d/d3ddevice.cpp mode change 100755 => 100644 src/engine.cpp mode change 100755 => 100644 src/gl/gl3device.cpp mode change 100755 => 100644 src/matfx.cpp mode change 100755 => 100644 src/pipeline.cpp mode change 100755 => 100644 src/ps2/pds.cpp mode change 100755 => 100644 src/ps2/ps2.cpp mode change 100755 => 100644 src/ps2/ps2device.cpp mode change 100755 => 100644 src/ps2/rwps2.h mode change 100755 => 100644 src/rwengine.h mode change 100755 => 100644 src/rwobjects.h mode change 100755 => 100644 src/rwplugins.h mode change 100755 => 100644 src/world.cpp mode change 100755 => 100644 tools/ps2test/gs.h mode change 100755 => 100644 tools/ps2test/main.cpp mode change 100755 => 100644 tools/ps2test/mem.h mode change 100755 => 100644 tools/ps2test/ps2.h mode change 100755 => 100644 tools/ps2test/vu/defaultpipe.dsm mode change 100755 => 100644 tools/ps2test/vu/light.vu mode change 100755 => 100644 tools/ps2test/vu/setup_persp.vu mode change 100755 => 100644 tools/ps2test/vu/skinpipe.dsm diff --git a/premake5.lua b/premake5.lua old mode 100755 new mode 100644 diff --git a/src/base.cpp b/src/base.cpp old mode 100755 new mode 100644 diff --git a/src/camera.cpp b/src/camera.cpp old mode 100755 new mode 100644 diff --git a/src/d3d/d3ddevice.cpp b/src/d3d/d3ddevice.cpp old mode 100755 new mode 100644 diff --git a/src/engine.cpp b/src/engine.cpp old mode 100755 new mode 100644 diff --git a/src/gl/gl3device.cpp b/src/gl/gl3device.cpp old mode 100755 new mode 100644 diff --git a/src/matfx.cpp b/src/matfx.cpp old mode 100755 new mode 100644 diff --git a/src/pipeline.cpp b/src/pipeline.cpp old mode 100755 new mode 100644 diff --git a/src/ps2/pds.cpp b/src/ps2/pds.cpp old mode 100755 new mode 100644 diff --git a/src/ps2/ps2.cpp b/src/ps2/ps2.cpp old mode 100755 new mode 100644 diff --git a/src/ps2/ps2device.cpp b/src/ps2/ps2device.cpp old mode 100755 new mode 100644 diff --git a/src/ps2/rwps2.h b/src/ps2/rwps2.h old mode 100755 new mode 100644 diff --git a/src/rwengine.h b/src/rwengine.h old mode 100755 new mode 100644 diff --git a/src/rwobjects.h b/src/rwobjects.h old mode 100755 new mode 100644 diff --git a/src/rwplugins.h b/src/rwplugins.h old mode 100755 new mode 100644 diff --git a/src/world.cpp b/src/world.cpp old mode 100755 new mode 100644 diff --git a/tools/ps2test/gs.h b/tools/ps2test/gs.h old mode 100755 new mode 100644 diff --git a/tools/ps2test/main.cpp b/tools/ps2test/main.cpp old mode 100755 new mode 100644 diff --git a/tools/ps2test/mem.h b/tools/ps2test/mem.h old mode 100755 new mode 100644 diff --git a/tools/ps2test/ps2.h b/tools/ps2test/ps2.h old mode 100755 new mode 100644 diff --git a/tools/ps2test/vu/defaultpipe.dsm b/tools/ps2test/vu/defaultpipe.dsm old mode 100755 new mode 100644 diff --git a/tools/ps2test/vu/light.vu b/tools/ps2test/vu/light.vu old mode 100755 new mode 100644 diff --git a/tools/ps2test/vu/setup_persp.vu b/tools/ps2test/vu/setup_persp.vu old mode 100755 new mode 100644 diff --git a/tools/ps2test/vu/skinpipe.dsm b/tools/ps2test/vu/skinpipe.dsm old mode 100755 new mode 100644 From b38cbc79617d77c7d33d0944d31a6cb540d19ffc Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 13 Jul 2018 01:09:45 +0200 Subject: [PATCH 2/6] fix 'comma at end of enumerator list [-Wpedantic]' --- src/base.err | 18 +++++++++--------- src/d3d/d3d.cpp | 2 +- src/d3d/rwd3d.h | 2 +- src/d3d/rwxbox.h | 2 +- src/d3d/xbox.cpp | 2 +- src/error.cpp | 2 +- src/gl/rwgl3.h | 2 +- src/ps2/ps2.cpp | 2 +- src/ps2/ps2raster.cpp | 2 +- src/ps2/rwps2.h | 2 +- src/rwbase.h | 12 ++++++------ src/rwengine.h | 2 +- src/rwobjects.h | 8 ++++---- src/rwrender.h | 4 ++-- src/rwuserdata.h | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/base.err b/src/base.err index 5e06a86..a1a37af 100644 --- a/src/base.err +++ b/src/base.err @@ -1,20 +1,20 @@ ECODE(ERR_GENERAL, - "Error: %s") + "Error: %s"), ECODE(ERR_ALLOC, - "Couldn't allocate 0x%X bytes") + "Couldn't allocate 0x%X bytes"), ECODE(ERR_FILE, - "Couldn't open file %s") + "Couldn't open file %s"), ECODE(ERR_CHUNK, - "Couldn't find chunk %s") + "Couldn't find chunk %s"), ECODE(ERR_VERSION, - "Unsupported version %X") + "Unsupported version %X"), ECODE(ERR_PLATFORM, - "Unsupported platform %d") + "Unsupported platform %d"), ECODE(ERR_ENGINEINIT, - "Engine could not be initialized") + "Engine could not be initialized"), ECODE(ERR_ENGINEOPEN, - "Engine could not be opened") + "Engine could not be opened"), ECODE(ERR_ENGINESTART, - "Engine could not be started") + "Engine could not be started"), ECODE(ERR_INVRASTER, "Invalid raster format") diff --git a/src/d3d/d3d.cpp b/src/d3d/d3d.cpp index f6465a9..f98e005 100644 --- a/src/d3d/d3d.cpp +++ b/src/d3d/d3d.cpp @@ -110,7 +110,7 @@ enum { // 2.8 biased fixed point D3DFMT_A2B10G10R10_XR_BIAS = 119, // Binary format indicating that the data has no inherent type - D3DFMT_BINARYBUFFER = 199, + D3DFMT_BINARYBUFFER = 199 }; #endif diff --git a/src/d3d/rwd3d.h b/src/d3d/rwd3d.h index c5bc854..b427eee 100644 --- a/src/d3d/rwd3d.h +++ b/src/d3d/rwd3d.h @@ -103,7 +103,7 @@ enum { D3DDECLUSAGE_COLOR, // 10 D3DDECLUSAGE_FOG, // 11 D3DDECLUSAGE_DEPTH, // 12 - D3DDECLUSAGE_SAMPLE, // 13 + D3DDECLUSAGE_SAMPLE // 13 }; #endif diff --git a/src/d3d/rwxbox.h b/src/d3d/rwxbox.h index b828c05..848bfb9 100644 --- a/src/d3d/rwxbox.h +++ b/src/d3d/rwxbox.h @@ -184,7 +184,7 @@ enum { D3DFMT_LIN_F16 = 0x00000031, D3DFMT_VERTEXDATA = 100, - D3DFMT_INDEX16 = 101, + D3DFMT_INDEX16 = 101 }; } diff --git a/src/d3d/xbox.cpp b/src/d3d/xbox.cpp index 725bec7..a798241 100644 --- a/src/d3d/xbox.cpp +++ b/src/d3d/xbox.cpp @@ -189,7 +189,7 @@ registerNativeDataPlugin(void) enum { D3DPT_TRIANGLELIST = 5, - D3DPT_TRIANGLESTRIP = 6, + D3DPT_TRIANGLESTRIP = 6 }; static void diff --git a/src/error.cpp b/src/error.cpp index 65e65af..5f26d97 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -23,7 +23,7 @@ getError(Error *e) return e; } -#define ECODE(c, s) s, +#define ECODE(c, s) s const char *errstrs[] = { "No error", diff --git a/src/gl/rwgl3.h b/src/gl/rwgl3.h index ac3150a..b4b032a 100644 --- a/src/gl/rwgl3.h +++ b/src/gl/rwgl3.h @@ -43,7 +43,7 @@ enum AttribIndices ATTRIB_TEXCOORDS4, ATTRIB_TEXCOORDS5, ATTRIB_TEXCOORDS6, - ATTRIB_TEXCOORDS7, + ATTRIB_TEXCOORDS7 }; // default uniform indices diff --git a/src/ps2/ps2.cpp b/src/ps2/ps2.cpp index b307ca0..a6c097d 100644 --- a/src/ps2/ps2.cpp +++ b/src/ps2/ps2.cpp @@ -521,7 +521,7 @@ enum { VIF_MARK = 0x07000000, VIF_FLUSH = 0x11000000, VIF_MSCALF = 0x15000000, - VIF_MSCNT = 0x17000000, + VIF_MSCNT = 0x17000000 }; struct InstMeshInfo diff --git a/src/ps2/ps2raster.cpp b/src/ps2/ps2raster.cpp index 94bc955..ab3b72b 100644 --- a/src/ps2/ps2raster.cpp +++ b/src/ps2/ps2raster.cpp @@ -37,7 +37,7 @@ enum Psm { PSMZ32 = 0x30, PSMZ24 = 0x31, PSMZ16 = 0x32, - PSMZ16S = 0x3A, + PSMZ16S = 0x3A }; // i don't really understand this, stolen from RW diff --git a/src/ps2/rwps2.h b/src/ps2/rwps2.h index f580d5f..a2d70ac 100644 --- a/src/ps2/rwps2.h +++ b/src/ps2/rwps2.h @@ -185,7 +185,7 @@ struct Ps2Raster enum Flags { NEWSTYLE = 0x1, // has GIF tags and transfer DMA chain SWIZZLED8 = 0x2, - SWIZZLED4 = 0x4, + SWIZZLED4 = 0x4 }; struct PixelPtr { // RW has pixels as second element but we don't want this struct diff --git a/src/rwbase.h b/src/rwbase.h index 1e871bc..4b39d1d 100644 --- a/src/rwbase.h +++ b/src/rwbase.h @@ -269,7 +269,7 @@ enum CombineOp { COMBINEREPLACE, COMBINEPRECONCAT, - COMBINEPOSTCONCAT, + COMBINEPOSTCONCAT }; struct RawMatrix @@ -398,7 +398,7 @@ enum PrimitiveType PRIMTYPETRILIST, PRIMTYPETRISTRIP, PRIMTYPETRIFAN, - PRIMTYPEPOINTLIST, + PRIMTYPEPOINTLIST }; /* @@ -503,7 +503,7 @@ enum VendorID // Used for rasters (platform-specific) VEND_RASTER = 10, // Used for driver/device allocation tags - VEND_DRIVER = 11, + VEND_DRIVER = 11 }; // TODO: modules (VEND_CRITERIONINT) @@ -559,17 +559,17 @@ enum PluginID ID_RASTERGL3 = MAKEPLUGINID(VEND_RASTER, PLATFORM_GL3), // anything driver/device related (only as allocation tag) - ID_DRIVER = MAKEPLUGINID(VEND_DRIVER, 0), + ID_DRIVER = MAKEPLUGINID(VEND_DRIVER, 0) }; enum CoreModuleID { ID_NAMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x00), ID_FRAMEMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x03), - ID_TEXTUREMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x08), + ID_TEXTUREMODULE = MAKEPLUGINID(VEND_CRITERIONINT, 0x08) }; -#define ECODE(c, s) c, +#define ECODE(c, s) c enum Errors { diff --git a/src/rwengine.h b/src/rwengine.h index d886b96..cbe8b43 100644 --- a/src/rwengine.h +++ b/src/rwengine.h @@ -13,7 +13,7 @@ enum DeviceReq DEVICETERM, // Device initialization after Engine/Driver plugins are opened - DEVICEFINALIZE, + DEVICEFINALIZE // TODO? counterpart to FINALIZE? }; diff --git a/src/rwobjects.h b/src/rwobjects.h index 017c4ee..d5afdc2 100644 --- a/src/rwobjects.h +++ b/src/rwobjects.h @@ -41,7 +41,7 @@ struct Frame SUBTREESYNCOBJ = 0x08, SUBTREESYNC = SUBTREESYNCLTM | SUBTREESYNCOBJ, SYNCLTM = HIERARCHYSYNCLTM | SUBTREESYNCLTM, - SYNCOBJ = HIERARCHYSYNCOBJ | SUBTREESYNCOBJ, + SYNCOBJ = HIERARCHYSYNCOBJ | SUBTREESYNCOBJ // STATIC = 0x10 }; @@ -219,7 +219,7 @@ struct Raster CAMERA = 0x02, TEXTURE = 0x04, CAMERATEXTURE = 0x05, - DONTALLOCATE = 0x80, + DONTALLOCATE = 0x80 }; }; @@ -451,7 +451,7 @@ struct Atomic // private flags WORLDBOUNDDIRTY = 0x01, // for setGeometry - SAMEBOUNDINGSPHERE = 0x01, + SAMEBOUNDINGSPHERE = 0x01 }; ObjectWithFrame object; @@ -541,7 +541,7 @@ struct Light AMBIENT, POINT = 0x80, // positioned SPOT, - SOFTSPOT, + SOFTSPOT }; enum Flags { LIGHTATOMICS = 1, diff --git a/src/rwrender.h b/src/rwrender.h index 207c232..d60469f 100644 --- a/src/rwrender.h +++ b/src/rwrender.h @@ -24,7 +24,7 @@ enum RenderState // platform specific or opaque? ALPHATESTFUNC, - ALPHATESTREF, + ALPHATESTREF }; enum AlphaTestFunc @@ -53,7 +53,7 @@ enum BlendFunction BLENDINVDESTALPHA, BLENDDESTCOLOR, BLENDINVDESTCOLOR, - BLENDSRCALPHASAT, + BLENDSRCALPHASAT // TODO: add more perhaps }; diff --git a/src/rwuserdata.h b/src/rwuserdata.h index 4bf7eb1..29c9ec6 100644 --- a/src/rwuserdata.h +++ b/src/rwuserdata.h @@ -5,7 +5,7 @@ enum UserDataType USERDATANA = 0, USERDATAINT = 1, USERDATAFLOAT = 2, - USERDATASTRING = 3, + USERDATASTRING = 3 }; struct UserDataArray From add55f08c5e6059a516bbd1d6939261104d81ce0 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 13 Jul 2018 01:33:18 +0200 Subject: [PATCH 3/6] =?UTF-8?q?fix=20'warning:=20implicit=20conversion=20f?= =?UTF-8?q?rom=20=E2=80=98rw::float32=E2=80=99=20{aka=20=E2=80=98float?= =?UTF-8?q?=E2=80=99}=20to=20=E2=80=98double=E2=80=99=20to=20match=20other?= =?UTF-8?q?=20operand=20of=20binary=20expression=20[-Wdouble-promotion]'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base.cpp | 28 ++++++++++++++-------------- src/camera.cpp | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/base.cpp b/src/base.cpp index fce04ad..4540028 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -110,9 +110,9 @@ slerp(const Quat &q, const Quat &p, float32 a) } float32 phi = acos(c); if(phi > 0.00001f){ - float32 s = sin(phi); - return add(scale(q1, sin((1.0f-a)*phi)/s), - scale(p, sin(a*phi)/s)); + float32 s = sinf(phi); + return add(scale(q1, sinf((1.0f-a)*phi)/s), + scale(p, sinf(a*phi)/s)); } return q1; } @@ -424,25 +424,25 @@ Matrix::getRotation(void) float32 tr = right.x + up.y + at.z; float s; if(tr > 0.0f){ - s = sqrt(1.0f + tr) * 2.0f; + s = sqrtf(1.0f + tr) * 2.0f; q.w = s / 4.0f; q.x = (up.z - at.y) / s; q.y = (at.x - right.z) / s; q.z = (right.y - up.x) / s; }else if(right.x > up.y && right.x > at.z){ - s = sqrt(1.0f + right.x - up.y - at.z) * 2.0f; + s = sqrtf(1.0f + right.x - up.y - at.z) * 2.0f; q.w = (up.z - at.y) / s; q.x = s / 4.0f; q.y = (up.x + right.y) / s; q.z = (at.x + right.z) / s; }else if(up.y > at.z){ - s = sqrt(1.0f + up.y - right.x - at.z) * 2.0f; + s = sqrtf(1.0f + up.y - right.x - at.z) * 2.0f; q.w = (at.x - right.z) / s; q.x = (up.x + right.y) / s; q.y = s / 4.0f; q.z = (at.y + up.z) / s; }else{ - s = sqrt(1.0f + at.z - right.x - up.y) * 2.0f; + s = sqrtf(1.0f + at.z - right.x - up.y) * 2.0f; q.w = (right.y - up.x) / s; q.x = (at.x + right.z) / s; q.y = (at.y + up.z) / s; @@ -513,8 +513,8 @@ Matrix::invertGeneral(Matrix *dst, const Matrix *src) // get the determinant from that det = src->up.x * dst->right.y + src->at.x * dst->right.z + dst->right.x * src->right.x; invdet = 1.0; - if(det != 0.0) - invdet = 1.0/det; + if(det != 0.0f) + invdet = 1.0f/det; dst->right.x *= invdet; dst->right.y *= invdet; dst->right.z *= invdet; @@ -535,10 +535,10 @@ void Matrix::makeRotation(Matrix *dst, V3d *axis, float32 angle) { V3d v = normalize(*axis); - angle = angle*M_PI/180.0f; + angle = angle*(float)M_PI/180.0f; float32 s = sin(angle); float32 c = cos(angle); - float32 t = 1.0f - cos(angle); + float32 t = 1.0f - c; dst->right.x = c + v.x*v.x*t; dst->right.y = v.x*v.y*t + v.z*s; @@ -588,9 +588,9 @@ float32 Matrix::normalError(void) { float32 x, y, z; - x = dot(right, right) - 1.0; - y = dot(up, up) - 1.0; - z = dot(at, at) - 1.0; + x = dot(right, right) - 1.0f; + y = dot(up, up) - 1.0f; + z = dot(at, at) - 1.0f; return x*x + y*y + z*z; } diff --git a/src/camera.cpp b/src/camera.cpp index e293d32..6311cc5 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -502,8 +502,8 @@ Camera::setFOV(float32 hfov, float32 ratio) float ar1 = 4.0/3.0; float ar2 = w/h; - float vfov = atan(tan(hfov/2) / ar1) *2; - hfov = atan(tan(vfov/2) * ar2) *2; + float vfov = atanf(tanf(hfov/2) / ar1) *2; + hfov = atanf(tanf(vfov/2) * ar2) *2; float32 a = tan(hfov); v.set(a, a/ratio); From 020e66a28285babbefc67465349ec01a6ea9c1b1 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 13 Jul 2018 01:50:18 +0200 Subject: [PATCH 4/6] =?UTF-8?q?fix=20'warning:=20overflow=20in=20conversio?= =?UTF-8?q?n=20from=20=E2=80=98rw::Errors=E2=80=99=20to=20=E2=80=98rw::int?= =?UTF-8?q?32=E2=80=99=20{aka=20=E2=80=98int=E2=80=99}=20changes=20value?= =?UTF-8?q?=20from=20=E2=80=98(rw::Errors)2147483650=E2=80=99=20to=20?= =?UTF-8?q?=E2=80=98-2147483646=E2=80=99=20[-Woverflow]'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/error.cpp | 2 +- src/rwerror.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/error.cpp b/src/error.cpp index 5f26d97..889cd47 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -33,7 +33,7 @@ const char *errstrs[] = { #undef ECODE char* -dbgsprint(int32 code, ...) +dbgsprint(uint32 code, ...) { va_list ap; static char strbuf[512]; diff --git a/src/rwerror.h b/src/rwerror.h index 937cc0e..2575626 100644 --- a/src/rwerror.h +++ b/src/rwerror.h @@ -10,7 +10,7 @@ void setError(Error *e); Error *getError(Error *e); #define _ERRORCODE(code, ...) code -char *dbgsprint(int32 code, ...); +char *dbgsprint(uint32 code, ...); /* ecode is supposed to be in format "(errorcode, printf-arguments..)" */ #define RWERROR(ecode) do{ \ From 12269003dafa4c3fe81ce3f3cfcbb22c120fa8f6 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 13 Jul 2018 02:05:00 +0200 Subject: [PATCH 5/6] =?UTF-8?q?fix=20'error:=20=E2=80=98uint8=E2=80=99=20w?= =?UTF-8?q?as=20not=20declared=20in=20this=20scope'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rwbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rwbase.h b/src/rwbase.h index 4b39d1d..5058697 100644 --- a/src/rwbase.h +++ b/src/rwbase.h @@ -80,7 +80,7 @@ struct LLLink }; #define LLLinkGetData(linkvar,type,entry) \ - ((type*)(((uint8*)(linkvar))-offsetof(type,entry))) + ((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry))) // Have to be careful since the link might be deleted. #define FORLIST(_link, _list) \ From 9ef08cbb19bac0dc1e636d8762a70a54ad02c065 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 13 Jul 2018 21:39:06 +0200 Subject: [PATCH 6/6] =?UTF-8?q?fix=20'warning:=20suggest=20parentheses=20a?= =?UTF-8?q?round=20arithmetic=20in=20operand=20of=20=E2=80=98|=E2=80=99'?= =?UTF-8?q?=20in=20public=20headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rwbase.h | 4 ++-- src/rwobjects.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rwbase.h b/src/rwbase.h index 5058697..984ebba 100644 --- a/src/rwbase.h +++ b/src/rwbase.h @@ -601,7 +601,7 @@ libraryIDPack(int version, int build) { if(version <= 0x31000) return version>>8; - return (version-0x30000 & 0x3FF00) << 14 | (version&0x3F) << 16 | + return ((version-0x30000) & 0x3FF00) << 14 | (version&0x3F) << 16 | (build & 0xFFFF); } @@ -609,7 +609,7 @@ inline int libraryIDUnpackVersion(uint32 libid) { if(libid & 0xFFFF0000) - return (libid>>14 & 0x3FF00) + 0x30000 | + return ((libid>>14 & 0x3FF00) + 0x30000) | (libid>>16 & 0x3F); else return libid<<8; diff --git a/src/rwobjects.h b/src/rwobjects.h index d5afdc2..a259e1a 100644 --- a/src/rwobjects.h +++ b/src/rwobjects.h @@ -258,11 +258,11 @@ struct Texture static Texture *fromDict(LLLink *lnk){ return LLLinkGetData(lnk, Texture, inDict); } FilterMode getFilter(void) { return (FilterMode)(filterAddressing & 0xFF); } - void setFilter(FilterMode f) { filterAddressing = filterAddressing & ~0xFF | f; } + void setFilter(FilterMode f) { filterAddressing = (filterAddressing & ~0xFF) | f; } Addressing getAddressU(void) { return (Addressing)((filterAddressing >> 8) & 0xF); } Addressing getAddressV(void) { return (Addressing)((filterAddressing >> 12) & 0xF); } - void setAddressU(Addressing u) { filterAddressing = filterAddressing & ~0xF00 | u<<8; } - void setAddressV(Addressing v) { filterAddressing = filterAddressing & ~0xF000 | v<<12; } + void setAddressU(Addressing u) { filterAddressing = (filterAddressing & ~0xF00) | u<<8; } + void setAddressV(Addressing v) { filterAddressing = (filterAddressing & ~0xF000) | v<<12; } static Texture *streamRead(Stream *stream); bool streamWrite(Stream *stream); uint32 streamGetSize(void);