Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-25 15:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fixed Win32 GCC Makefile.

Browse source 
- Reverted Nik's polygon palette index change in Models.cpp. Subtracting 1 was breaking Scud Race.
- Added an explicit typecast in Inputs.cpp, which GCC requires for some reason.
This commit is contained in:
Bart Trzynadlowski 2012-07-16 02:27:55 +00:00
parent 183dca563d
commit f1e93bcd8f
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefiles/Makefile.SDL.Win32.GCC
View file

@ -219,6 +219,9 @@ $(OBJ_DIR)/%.o: Src/CPU/Z80/%.cpp
$(OBJ_DIR)/%.o: Src/Inputs/%.cpp $(OBJ_DIR)/%.o: Src/Inputs/%.cpp
$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o $(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
$(OBJ_DIR)/%.o: Src/OSD/%.cpp
$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
$(OBJ_DIR)/%.o: Src/OSD/SDL/%.cpp $(OBJ_DIR)/%.o: Src/OSD/SDL/%.cpp
$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o $(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o

2
Src/Graphics/Models.cpp
View file

@ -394,7 +394,7 @@ void CRender3D::InsertVertex(ModelCache *Cache, const Vertex *V, const Poly *P,
// Material color // Material color
if ((P->header[1]&2) == 0) if ((P->header[1]&2) == 0)
{ {
colorIdx = ((P->header[4]>>20)&0x7FF) - 1; colorIdx = ((P->header[4]>>20)&0x7FF) - 0;
b = (GLfloat) (polyRAM[0x400+colorIdx]&0xFF) * (1.0f/255.0f); b = (GLfloat) (polyRAM[0x400+colorIdx]&0xFF) * (1.0f/255.0f);
g = (GLfloat) ((polyRAM[0x400+colorIdx]>>8)&0xFF) * (1.0f/255.0f); g = (GLfloat) ((polyRAM[0x400+colorIdx]>>8)&0xFF) * (1.0f/255.0f);
r = (GLfloat) ((polyRAM[0x400+colorIdx]>>16)&0xFF) * (1.0f/255.0f); r = (GLfloat) ((polyRAM[0x400+colorIdx]>>16)&0xFF) * (1.0f/255.0f);

2
Src/Inputs/Inputs.cpp
View file

@ -585,7 +585,7 @@ void CInputs::CalibrateJoystick(int joyNum)
if (!joyDetails->hasAxis[axisNum]) if (!joyDetails->hasAxis[axisNum])
continue; continue;
axisNumList.push_back(axisNum); axisNumList.push_back(axisNum);
printf(" %u: %s\n", axisNumList.size(), joyDetails->axisName[axisNum]); printf(" %u: %s\n", (unsigned) axisNumList.size(), joyDetails->axisName[axisNum]);
} }
printf(" 0: Unsure - help me choose...\n"); printf(" 0: Unsure - help me choose...\n");