Less warnings

ChangeLog

@@ -5,6 +5,10 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140129 ]
+	* Removed unused libferit stuff
+	* Changed code to generate much less warnings
+
 	[ 20140124 ]
 	* Fixed some TombRaider.cpp warnings
 

Makefile

@@ -60,15 +60,6 @@ BASE_LIBS += $(GL_LIBS)
 BASE_DEFS += $(AUDIO_DEFS)
 BASE_DEFS += $(GL_DEFS)
 
-# libferit, File transfer via HTTP/FTP/etc support
-LIBFERIT_LIB=/usr/local/lib/libferit.so
-LIBFERIT=$(shell if test -e $(LIBFERIT_LIB) > /dev/null; then echo yes; fi)
-
-ifeq ($(LIBFERIT), yes)
-	BASE_DEFS += -DHAVE_LIBFERIT
-	BASE_LIBS += -lferit
-endif
-
 ###############################################################
 
 TREE_DIR=OpenRaider
@@ -95,7 +86,7 @@ WARNINGS+=-Wno-documentation-unknown-command -Wno-format-nonliteral
 WARNINGS+=-Wno-covered-switch-default -Wno-global-constructors
 WARNINGS+=-Wno-exit-time-destructors -Wno-c++98-compat-pedantic
 WARNINGS+=-Wno-disabled-macro-expansion -Wno-missing-variable-declarations
-WARNINGS+=-Wno-missing-prototypes
+WARNINGS+=-Wno-missing-prototypes -Wno-pedantic
 
 WARNINGS+=-Wno-conversion -Wno-sign-conversion -Wno-shorten-64-to-32
 

include/GLString.h

@@ -95,10 +95,8 @@ public:
      * \brief Renders strings over GL scene.
      * Should be called after scene is rendered.
      * GL Culling should be disabled.
-     * \param width width of GL context
-     * \param height height of GL context
      */
-    void Render(int width, int height);
+    void Render();
 
     /*!
      * \brief Get the String data structure for a string id

include/System.h

@@ -95,25 +95,6 @@ public:
     virtual unsigned int getTicks();
 
     /*!
-     * \brief Downloads something into passed buffer
-     * \todo Not yet implemented!
-     * \param urlString URL of thing to download
-     * \param buffer array of strings as target
-     * \param size size of  buffer
-     * \returns < 0 on error, 0 on success
-     */
-    static int downloadToBuffer(char *urlString, unsigned char **buffer, unsigned int *size);
-
-    /*!
-     * \brief Downloads something into a disk file.
-     * Supports HTTP and FTP.
-     * \param urlString URL of thing to download
-     * \param filename file that should be created/filled
-     * \returns < 0 on error, 0 on success. -1000 if libferit not linked
-     */
-    static int downloadToFile(char *urlString, char *filename);
-
-    /*!
      * \brief Created a directory
      * \param path Directory to create
      * \returns -1 on error

src/GLString.cpp

@@ -169,7 +169,7 @@ int GLString::glPrintf(int x, int y, const char *string, ...) {
 }
 
 
-void GLString::Render(int width, int height) {
+void GLString::Render() {
     for (unsigned int i = 0; i < _num_string; ++i) {
         if (_string[i].active)
             glPrint2d(_string[i].x, _string[i].y, _string[i].scale, _string[i].text);

src/Network.cpp

@@ -23,21 +23,17 @@
 #include <stdlib.h>
 
 //#define LOCAL_BCAST
-#define NETWORK_RELIABLE
 #define MAX_CLIENTS 32
 
-typedef struct client_s
-{
+typedef struct client_s {
     unsigned int uid;
     char active;
     unsigned int seq;
     unsigned int frameExpected;
-
 } client_t;
 
-
 #ifdef USING_PTHREADS
-#   include <pthread.h>
+#include <pthread.h>
 pthread_t gPThreadId[3];
 #endif
 

src/OpenGLMesh.cpp

@@ -163,11 +163,15 @@ void OpenGLMesh::drawAlpha()
         {
             case OpenGLMeshModeWireframe:
                 glColor3f(0.0, 0.0, 1.0);
+                glBindTexture(GL_TEXTURE_2D, 0);
+                break;
             case OpenGLMeshModeSolid:
                 // Bind WHITE texture for solid colors
                 glBindTexture(GL_TEXTURE_2D, 0);
                 break;
             default:
+            case OpenGLMeshModeTexture:
+            case OpenGLMeshModeMultiTexture:
                 // Bind texture id for textures
                 glBindTexture(GL_TEXTURE_2D, mQuads[i].texture+1);
         }
@@ -196,11 +200,15 @@ void OpenGLMesh::drawAlpha()
         {
             case OpenGLMeshModeWireframe:
                 glColor3f(0.0, 1.0, 0.0);
+                glBindTexture(GL_TEXTURE_2D, 0);
+                break;
             case OpenGLMeshModeSolid:
                 // Bind WHITE texture for solid colors
                 glBindTexture(GL_TEXTURE_2D, 0);
                 break;
             default:
+            case OpenGLMeshModeTexture:
+            case OpenGLMeshModeMultiTexture:
                 // Bind texture id for textures
                 glBindTexture(GL_TEXTURE_2D, mTris[i].texture+1);
         }
@@ -248,8 +256,8 @@ void OpenGLMesh::drawSolid()
 
         glPointSize(1.0f);
 
-        return; //! \fixme
-
+        //! \fixme
+        /*
         for (j = 0; j < mQuads[i].num_quads; ++j)
         {
             for (k = 0; k < 4; ++k)
@@ -260,6 +268,7 @@ void OpenGLMesh::drawSolid()
                 glArrayElement(mQuads[i].quads[j*4+k]);
             }
         }
+        */
 
         return;
     }
@@ -286,8 +295,11 @@ void OpenGLMesh::drawSolid()
                 glEnable(GL_TEXTURE_2D);
                 glBindTexture(GL_TEXTURE_2D, mQuads[i].bumpmap+1);
                 break;
+#else
+            case OpenGLMeshModeMultiTexture:
 #endif
             default:
+            case OpenGLMeshModeTexture:
                 // Bind texture id for textures
                 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
                 glBindTexture(GL_TEXTURE_2D, mQuads[i].texture+1);
@@ -344,8 +356,11 @@ void OpenGLMesh::drawSolid()
                 glEnable(GL_TEXTURE_2D);
                 glBindTexture(GL_TEXTURE_2D, mTris[i].bumpmap+1);
                 break;
+#else
+            case OpenGLMeshModeMultiTexture:
 #endif
             default:
+            case OpenGLMeshModeTexture:
                 // Bind texture id for textures
                 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
                 glBindTexture(GL_TEXTURE_2D, mTris[i].texture+1);

src/OpenRaider.cpp

@@ -357,6 +357,8 @@ void OpenRaider::handleMouseMotionEvent(float x, float y)
                     eventAnimTest(TR_ANIAMTION_SWIM_R);
                     break;
                 default:
+                case worldMoveType_walk:
+                case worldMoveType_walkNoSwim:
                     eventAnimTest(TR_ANIAMTION_TURN_L); // TURN left always for now
             }
 
@@ -378,6 +380,8 @@ void OpenRaider::handleMouseMotionEvent(float x, float y)
                     eventAnimTest(TR_ANIAMTION_SWIM_L);
                     break;
                 default:
+                case worldMoveType_walk:
+                case worldMoveType_walkNoSwim:
                     eventAnimTest(TR_ANIAMTION_TURN_L);
             }
 
@@ -438,6 +442,8 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
                 }
             }
@@ -451,6 +457,8 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                         eventAnimTest(TR_ANIAMTION_SWIM_IDLE);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_HIT_WALL_FRONT);
                 }
             }
@@ -472,6 +480,8 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
                 }
             }
@@ -489,6 +499,8 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
                 }
             }
@@ -510,6 +522,8 @@ void OpenRaider::handleBoundKeyPressEvent(unsigned int key)
                         eventAnimTest(TR_ANIAMTION_SWIM);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_RUN);
                 }
             }
@@ -1081,6 +1095,10 @@ void OpenRaider::loadLevel(char *mapname)
                 m_tombraider.loadSFX(altSfx);
                 break;
             default:
+            case TR_VERSION_1:
+            case TR_VERSION_4:
+            case TR_VERSION_5:
+            case TR_VERSION_UNKNOWN:
                 ;
         }
     }
@@ -1181,7 +1199,7 @@ void OpenRaider::gameFrame()
         default:
             if (LARA)
             {
-                SkeletalModel *mdl = (SkeletalModel *)LARA->tmpHook;
+                mdl = (SkeletalModel *)LARA->tmpHook;
 
                 if (mdl)
                 {
@@ -1226,6 +1244,8 @@ void OpenRaider::gameFrame()
                         eventAnimTest(TR_ANIAMTION_SWIM_IDLE);
                         break;
                     default:
+                    case worldMoveType_walk:
+                    case worldMoveType_walkNoSwim:
                         eventAnimTest(TR_ANIAMTION_STAND);
                 }
 
@@ -1533,6 +1553,10 @@ void OpenRaider::processMoveables()
                         }
                         break;
                     default:
+                    case TR_VERSION_2:
+                    case TR_VERSION_3:
+                    case TR_VERSION_5:
+                    case TR_VERSION_UNKNOWN:
                         ;
                 }
         }
@@ -1648,6 +1672,10 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                 r_model->tr4Overlay = true;
                 break;
             default:
+            case TR_VERSION_1:
+            case TR_VERSION_2:
+            case TR_VERSION_5:
+            case TR_VERSION_UNKNOWN:
                 LARA->modelId = index;
                 sModel->setAnimation(TR_ANIAMTION_RUN);
                 sModel->setIdleAnimation(TR_ANIAMTION_STAND);
@@ -1733,7 +1761,13 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     m_render.setFlags(Render::fRenderPonytail);
                     print(true, "Found known ponytail\n");
                 }
+                break; // ?
             default:
+            case TR_VERSION_1:
+            case TR_VERSION_2:
+            case TR_VERSION_3:
+            case TR_VERSION_5:
+            case TR_VERSION_UNKNOWN:
                 if (LARA && moveable[index].object_id == 2)
                 {
                     r_model->ponytailId = k;
@@ -1923,7 +1957,7 @@ void OpenRaider::processMoveable(int index, int i, int *ent,
                     int *tree;
                     // Hack: moveable[index].mesh_tree is a byte offset
                     //       into mesh_tree[], so we have to convert to index
-                    tree = (int *)meshtree;
+                    tree = (int *)(void *)meshtree;
                     mesh_tree = (tr2_meshtree_t *)&tree[moveable[index].mesh_tree
                         + ((j - 1) * 4)];
 
@@ -3563,12 +3597,14 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
 }
 
 
-int main(int argc, char *argv[])
-{
-    OpenRaider *game = OpenRaider::Instance();
+int main(int argc, char *argv[]) {
+    if (argc != 1) {
+        printf("Usage:\n\t%s\n", argv[0]);
+        return 1;
+    }
 
+    OpenRaider *game = OpenRaider::Instance();
     atexit(killOpenRaiderSingleton);
-
     game->start();
 
     return 0;

src/Render.cpp

@@ -331,7 +331,8 @@ void Render::initEmitter(const char *name, unsigned int size,
 #ifdef USING_EMITTER
     // Mongoose 2002.01.01, Screwing around with particle emitter test
     //   note this is backwards b/c load screen is rendered upsidedown
-    mEmitter = new Emitter(/*name*/"snow", size);
+    //mEmitter = new Emitter(/*name*/"snow", size);
+    mEmitter = new Emitter(name, size);
     mEmitter->SetTextureId(snowTex1);
     mEmitter->TextureId(120, 280, snowTex2);
     mEmitter->TextureId(400, 450, snowTex2);
@@ -712,20 +713,14 @@ void deprecated_gluLookAt(float eyeX, float eyeY, float eyeZ, float lookAtX, flo
     fMag = sqrt(f[0]*f[0] + f[1]*f[1] + f[2]*f[2]);
     upMag = sqrt(upX*upX + upY*upY + upZ*upZ);
     // normalizing the viewing vector
-    if( fMag != 0)
-    {
-        f[0] = f[0]/fMag;
-        f[1] = f[1]/fMag;
-        f[2] = f[2]/fMag;
-    }
+    f[0] = f[0]/fMag;
+    f[1] = f[1]/fMag;
+    f[2] = f[2]/fMag;
     // normalising the up vector. no need for this here if you have your
     // up vector already normalised, which is mostly the case.
-    if( upMag != 0 )
-    {
-        upX = upX/upMag;
-        upY = upY/upMag;
-        upZ = upZ/upMag;
-    }
+    upX = upX/upMag;
+    upY = upY/upMag;
+    upZ = upZ/upMag;
     float s[3], u[3];
     CrossProd(f[0], f[1], f[2], upX, upY, upZ, s);
     CrossProd(s[0], s[1], s[2], f[0], f[1], f[2], u);
@@ -764,7 +759,6 @@ void Render::Display()
     {
         case Render::modeDisabled:
             return;
-            break;
         case Render::modeLoadScreen:
             //! \fixme entry for seperate main drawing method -- Mongoose 2002.01.01
             drawLoadScreen();
@@ -795,6 +789,8 @@ void Render::Display()
                 camOffsetH = 64.0f;
                 break;
             default:
+            case worldMoveType_walk:
+            case worldMoveType_walkNoSwim:
                 camOffsetH = 512.0f;
         }
 
@@ -1018,7 +1014,7 @@ void Render::Display()
 
     glEnterMode2d(mWidth, mHeight);
     glColor3fv(OR_BLUE);
-    mString.Render(mWidth, mHeight);
+    mString.Render();
     glExitMode2d();
 
 #ifdef USING_EMITTER
@@ -1293,7 +1289,7 @@ void Render::drawLoadScreen()
 
     glEnterMode2d(mWidth, mHeight);
     glColor3fv(OR_BLUE);
-    mString.Render(mWidth, mHeight);
+    mString.Render();
     glExitMode2d();
 
     glFlush();

src/SDLSystem.cpp

@@ -215,7 +215,7 @@ void SDLSystem::runGame()
 {
     SDL_Event event;
     unsigned int mkeys, mod, key;
-    int btn;
+    int btn = 0;
     bool specialKey;
 
 
@@ -478,7 +478,7 @@ void SDLSystem::shutdown(int i)
     //dump_memory_report();
     //#endif
 
-    exit(0);
+    exit(i);
 }
 
 
@@ -501,7 +501,8 @@ void SDLSystem::toggleFullscreen()
         // Now you can see something when switching to Fullscreen,
         // but it's full of graphical glitches...? I don't know...
         // -- xythobuz 2013-12-31
-        int width, height;
+        int width = m_width,
+            height = m_height;
         if (mFullscreen) {
             m_old_width = m_width;
             m_old_height = m_height;
@@ -514,10 +515,6 @@ void SDLSystem::toggleFullscreen()
                 //! \fixme Don't just use first available resolution...
                 width = dimensions[0]->w;
                 height = dimensions[0]->h;
-            } else {
-                // No restrictions, use current resolution
-                width = m_width;
-                height = m_height;
             }
         }
         if (!mFullscreen) {

src/System.cpp

@@ -25,13 +25,6 @@
 #endif
 #endif
 
-#ifdef HAVE_LIBFERIT
-#include <ferit/Url.h>
-#include <ferit/TcpProtocol.h>
-#include <ferit/Http.h>
-#include <ferit/Ftp.h>
-#endif
-
 #if defined(linux) || defined(__APPLE__)
 #include <time.h>
 #include <sys/time.h>
@@ -246,72 +239,6 @@ int System::createDir(char *path)
 }
 
 
-int System::downloadToBuffer(char *urlString,
-        unsigned char **buffer, unsigned int *size)
-{
-#ifdef HAVE_LIBFERIT
-    printf("ERROR: This build is libferit enabled, but func not implemented\n");
-    return -1;
-#else
-    printf("ERROR: This build not libferit enabled, unable to download\n");
-    return -1000;
-#endif
-}
-
-
-int System::downloadToFile(char *urlString, char *filename)
-{
-#ifdef HAVE_LIBFERIT
-    int err = 0;
-    unsigned int timeout = 10;
-    Url *url = 0x0;
-    TcpProtocol *client = 0x0;
-
-
-    if (!urlString || !urlString[0])
-        return -1;
-
-    url = new Url("");
-    url->UrlToSession(urlString);
-    url->Options(OPT_RESUME | OPT_QUIET);
-    url->Outfile(url->Filename());
-
-    switch (url->Protocol())
-    {
-        case FTP_SESSION:
-            client = new Ftp(timeout);
-            break;
-        case HTTP_SESSION:
-            client = new Http(timeout);
-            break;
-        default:
-            printf("Sorry the protocol used in the URL isn't unsupported.\n");
-
-            if (client)
-            {
-                delete client;
-            }
-
-            return -2;
-    }
-
-    if (client)
-    {
-        err = client->Download(url, NULL);
-        delete client;
-    }
-
-    if (url)
-        delete url;
-
-    return err;
-#else
-    printf("ERROR: This build not libferit enabled, unable to download\n");
-    return -1000;
-#endif
-}
-
-
 ////////////////////////////////////////////////////////////
 // Public Mutators
 ////////////////////////////////////////////////////////////
@@ -754,7 +681,6 @@ unsigned int system_timer(int state)
 #else
             return (stop.tv_sec-start.tv_sec)*1000+(stop.tv_usec-start.tv_usec)/1000;
 #endif
-            break;
     }
 
     return 0;

src/Texture.cpp

@@ -290,8 +290,6 @@ int Texture::loadFontTTF(const char *filename,
     {
         return -2;
     }
-
-    return -3;
 }
 
 
@@ -498,7 +496,7 @@ ttf_texture_t *Texture::generateFontTexture(const char *filename, int pointSize,
                 if (verbose)
                 {
                     printf("Offset: %i; Pixel: %i,%i; Data: 0x%08x\n",
-                            offset, w, h, *((unsigned int *)&image[k*4]));
+                            offset, w, h, *((unsigned int *)(void *)&image[k*4]));
                 }
 
                 /* 32-bit ARGB to RGBA */
@@ -701,7 +699,7 @@ int Texture::loadBufferSlot(unsigned char *image,
 
     if (!mTextureIds || slot >= mTextureLimit)
     {
-        printf("Texture::Load> ERROR Not initalizied or out of free slots\n");
+        printf("Texture::Load> ERROR Not initialized or out of free slots\n");
         return -1000;
     }
 
@@ -719,17 +717,15 @@ int Texture::loadBufferSlot(unsigned char *image,
                 printf("Texture::Load> ERROR Unsupported GREYSCALE, %i bpp\n", bpp);
                 return -2;
             }
-
             bytes = 1;
             glcMode = GL_LUMINANCE;
             break;
         case RGB:
             if (bpp != 24)
             {
-                printf("Texture::Load> ERROR Unsupported RGBA, %i bpp\n", bpp);
+                printf("Texture::Load> ERROR Unsupported RGB, %i bpp\n", bpp);
                 return -2;
             }
-
             bytes = 3;
             glcMode = GL_RGB;
             break;
@@ -738,19 +734,23 @@ int Texture::loadBufferSlot(unsigned char *image,
             {
                 convertARGB32bppToRGBA32bpp(image, width, height);
             }
+            else
+            {
+                printf("Texture::Load> ERROR Unsupported ARGB, %i bpp\n", bpp);
+                return -2;
+            }
+            bytes = 4;
+            glcMode = GL_RGBA;
+            break;
         case RGBA:
             if (bpp != 32)
             {
-                printf("Texture::Load> ERROR Unsupported RGBA/ARGB, %i bpp\n", bpp);
+                printf("Texture::Load> ERROR Unsupported RGBA, %i bpp\n", bpp);
                 return -2;
             }
-
             bytes = 4;
             glcMode = GL_RGBA;
             break;
-        default:
-            printf("Texture::Load> ERROR Unknown color mode %i\n", mode);
-            return -2;
     }
 
     glClearColor(0.0, 0.0, 0.0, 0.0);

src/TombRaider.cpp

@@ -825,7 +825,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
         /* Identify vertices */
         data_offset = 0;
         //! \fixme endian
-        _rooms[i].room_data.num_vertices = *(short *)(_rooms[i].data);
+        _rooms[i].room_data.num_vertices = *(short *)(void *)(_rooms[i].data);
 
         data_offset += sizeof(_rooms[0].room_data.num_vertices);
         data_size = _rooms[i].room_data.num_vertices * sizeof(tr2_vertex_room_t);
@@ -872,7 +872,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
         /* identify rectangles */
         //! \fixme endian conversion
         _rooms[i].room_data.num_rectangles =
-            *(short *)(_rooms[i].data + data_offset);
+            *(short *)(void *)(_rooms[i].data + data_offset);
 
         data_offset += sizeof(_rooms[0].room_data.num_rectangles);
         data_size = _rooms[i].room_data.num_rectangles * sizeof(tr2_quad_t);
@@ -903,7 +903,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
         /* Identify triangles */
         _rooms[i].room_data.num_triangles =
-            *(short *)(_rooms[i].data + data_offset);
+            *(short *)(void *)(_rooms[i].data + data_offset);
         //! \fixme endian
 
         data_offset += sizeof(_rooms[0].room_data.num_triangles);
@@ -936,7 +936,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
         /* Identify sprites */
         _rooms[i].room_data.num_sprites =
-            *(short *)(_rooms[i].data + data_offset);
+            *(short *)(void *)(_rooms[i].data + data_offset);
         //! \fixme endian
 
         data_offset += sizeof(_rooms[0].room_data.num_sprites);

test/GLString.cpp

@@ -68,7 +68,7 @@ void event_display(int width, int height) {
     glColor3f(0.75, 0.5, 1.0);
 
     glEnterMode2d(width, height);
-    TEXT->Render(width, height);
+    TEXT->Render();
     glExitMode2d();
 
     glFlush();