build: resolve 101 instances of -Wunused-variable

2dlib/memsurf.cpp

@@ -140,8 +140,6 @@ bool grMemorySurface::init(int w, int h, int bpp, char *data, int rowsize, unsig
 //	internal functions
 //	---------------------------------------------------------------------------
 
-static mem_bitmap grMemSurf_object;
-
 bool gr_bm_mem_Blt16(ddgr_surface *dsf, int dx, int dy, ddgr_surface *ssf, int sx, int sy, int sw, int sh);
 bool gr_bm_mem_Blt16ck(ddgr_surface *dsf, int dx, int dy, ddgr_surface *ssf, int sx, int sy, int sw, int sh);
 

2dlib/pentext.cpp

@@ -96,7 +96,6 @@
 
 #define STR_BUF_SIZE 512
 static char Str_buf[STR_BUF_SIZE];      // String buffer for variable arguments
-static char Draw_str_buf[STR_BUF_SIZE]; // used to buffer words in a string
 
 //	---------------------------------------------------------------------------
 //	Viewport font and text funcitons

bitmap/bitmain.cpp

@@ -575,8 +575,6 @@ int bm_AllocNoMemBitmap(int w, int h) {
 // Searches thru all bitmaps for a specific name, returns -1 if not found
 // or index of bitmap with name
 int bm_FindBitmapName(const char *name) {
-  int num_counted = 0;
-
   bms_bitmap fbmp;
   strcpy(fbmp.name, name);
   bm_Node *fnode = bm_findNode(&fbmp);
@@ -641,8 +639,6 @@ int bm_TestName(const char *src) {
   strncpy(namedest, filename, limit);
   namedest[limit] = 0;
 
-  int cur_len = strlen(namedest);
-
   // Now, make sure there are no other bitmaps with this name
   strcat(namedest, ".ogf");
   if ((i = bm_FindBitmapName(namedest)) == -1)
@@ -652,7 +648,6 @@ int bm_TestName(const char *src) {
 // gets the filename from a path, plus appends our .ogf extension
 void bm_ChangeEndName(const char *src, char *dest) {
   uint32_t i, limit;
-  int last = -1;
   int curnum = -1;
   char namedest[256 + 16];
   char path[256], ext[256], filename[256];

bitmap/iff.cpp

@@ -382,7 +382,7 @@ int bm_iff_parse_file(CFILE *ifile, iff_bitmap_header *bmheader, iff_bitmap_head
 
     switch (sig) {
     case IFF_SIG_FORM: {
-      int newsig = bm_iff_get_sig(ifile);
+      bm_iff_get_sig(ifile);
       bmheader->type = TYPE_PBM;
       break;
     }

grtext/grtext.cpp

@@ -760,7 +760,6 @@ int grtext_GetTextLineWidth(const char *str) {
   int line_width = 0, max_width = 0;
   int rgb_define_mode = 0;
   int strsize = strlen(str);
-  int line_idx = 0;
 
   for (int i = 0; i < strsize; i++) {
     int width;

libmve/mveplay.cpp

@@ -174,7 +174,7 @@ static int create_audiobuf_handler(unsigned char major, unsigned char minor, uns
 
   int flags = get_ushort(data + 2);
   int sample_rate = get_ushort(data + 4);
-  int desired_buffer = get_int(data + 6);
+  // int desired_buffer = get_int(data + 6);
 
   int channels = (flags & MVE_AUDIO_FLAGS_STEREO) ? 2 : 1;
   int sample_size = (flags & MVE_AUDIO_FLAGS_16BIT) ? 2 : 1;
@@ -338,12 +338,12 @@ static int video_codemap_handler(unsigned char major, unsigned char minor, unsig
 static int video_data_handler(unsigned char major, unsigned char minor, unsigned char *data, int len, void *context) {
   unsigned char *temp;
 
-  short nFrameHot = get_short(data);
-  short nFrameCold = get_short(data + 2);
-  short nXoffset = get_short(data + 4);
-  short nYoffset = get_short(data + 6);
-  short nXsize = get_short(data + 8);
-  short nYsize = get_short(data + 10);
+  // short nFrameHot = get_short(data);
+  // short nFrameCold = get_short(data + 2);
+  // short nXoffset = get_short(data + 4);
+  // short nYoffset = get_short(data + 6);
+  // short nXsize = get_short(data + 8);
+  // short nYsize = get_short(data + 10);
   unsigned short nFlags = get_ushort(data + 12);
 
   if (nFlags & 1) {

manage/gamefilepage.cpp

@@ -76,7 +76,7 @@ int mng_ReadNewGamefilePage(CFILE *infile, mngs_gamefile_page *gamefilepage) {
   ASSERT(infile != NULL);
   memset(gamefilepage, 0, sizeof(mngs_gamefile_page));
 
-  int version = cf_ReadShort(infile);
+  /* int version = */ cf_ReadShort(infile);
 
   cf_ReadString(gamefilepage->gamefile_struct.name, PAGENAME_LEN, infile);
   cf_ReadString(gamefilepage->gamefile_struct.dir_name, PAGENAME_LEN, infile);

manage/manage.cpp

@@ -1480,7 +1480,7 @@ void mng_TransferPages() {
       continue;
     }
     pagetype = cf_ReadByte(infile);
-    int len = cf_ReadInt(infile);
+    /* int len = */ cf_ReadInt(infile);
     switch (pagetype) {
     case PAGETYPE_TEXTURE:
       mng_ReadNewTexturePage(infile, &texpage);
@@ -2208,7 +2208,7 @@ int mng_ReplacePage(char *srcname, char *destname, int handle, int dest_pagetype
 // If local is 1, deletes from the local table file
 int mng_DeletePage(char *name, int dest_pagetype, int local) {
   CFILE *infile, *outfile;
-  uint8_t pagetype, replaced = 0;
+  uint8_t pagetype;
   int done = 0;
   int deleted = 0;
 

manage/megapage.cpp

@@ -176,7 +176,7 @@ int mng_ReadNewMegacellPage(CFILE *infile, mngs_megacell_page *megacellpage) {
   int i;
   ASSERT(infile != NULL);
   memset(megacellpage, 0, sizeof(mngs_megacell_page));
-  int version = cf_ReadShort(infile);
+  /* int version = */ cf_ReadShort(infile);
 
   cf_ReadString(megacellpage->megacell_struct.name, PAGENAME_LEN, infile);
 

manage/pagelock.cpp

@@ -225,7 +225,6 @@ void mng_InitPagelocks() {
 // Returns pointer to locker's name, or NULL if the file is unlocked
 char *mng_CheckIfLockerPresent() {
   CFILE *infile;
-  int i = 0;
   static char lockname[200];
 
   ASSERT(Network_up);
@@ -380,7 +379,6 @@ int mng_CheckIfPageLocked(mngs_Pagelock *pl) {
       r = 2;
     } else {
       if (!stricmp(pl->name, testlock.name)) {
-        int test = 0;
         if (pl->pagetype == testlock.pagetype) {
           if (!stricmp(testlock.holder, "UNLOCKED"))
             r = 0;
@@ -602,7 +600,7 @@ int mng_DeletePagelock(char *name, int pagetype) {
 // Given a list of names and a pagetype, deletes the ones already inside the lock file
 int mng_DeletePagelockSeries(char *names[], int num, int pagetype) {
   CFILE *infile, *outfile;
-  int done = 0, deleted = 0;
+  int done = 0;
   mngs_Pagelock temp_pl;
 
   infile = (CFILE *)cfopen(TableLockFilename, "rb");
@@ -656,7 +654,7 @@ int mng_DeletePagelockSeries(char *names[], int num, int pagetype) {
 // Goes through the pagelock table and deletes all duplicate entries
 int mng_DeleteDuplicatePagelocks() {
   CFILE *infile; //,*outfile;
-  int done = 0, deleted = 0;
+  int done = 0;
   mngs_Pagelock temp_pl;
   mngs_Pagelock *already_read;
   int num = 0, duplicates = 0, i;
@@ -727,7 +725,7 @@ int mng_UnlockPagelockSeries(const char *names[], int *pagetypes, int num) {
   memset(already_done, 0, 500);
 
   CFILE *infile, *outfile;
-  int done = 0, deleted = 0;
+  int done = 0;
   mngs_Pagelock temp_pl;
   int total = 0;
 

manage/soundpage.cpp

@@ -221,7 +221,7 @@ void mng_WriteNewSoundPage(CFILE *outfile, mngs_sound_page *soundpage) {
 // Reads a sound page from an open file.  Returns 0 on error.
 int mng_ReadNewSoundPage(CFILE *infile, mngs_sound_page *soundpage) {
   ASSERT(infile != NULL);
-  int version = cf_ReadShort(infile);
+  /* int version = */ cf_ReadShort(infile);
   // read in name,rawfile name
   cf_ReadString(soundpage->sound_struct.name, PAGENAME_LEN, infile);
   cf_ReadString(soundpage->raw_name, PAGENAME_LEN, infile);

manage/texpage.cpp

@@ -762,9 +762,8 @@ int mng_ReadNewTexturePage(CFILE *infile, mngs_texture_page *texpage) {
 // If local is 1, deletes from the local table file
 int mng_DeleteTexPageSeries(char *names[], int num_textures, int local) {
   CFILE *infile, *outfile;
-  uint8_t pagetype, replaced = 0;
+  uint8_t pagetype;
   int done = 0;
-  int deleted = 0;
   memset(&texpage1, 0, sizeof(mngs_texture_page));
 
   if (local)
@@ -796,7 +795,7 @@ int mng_DeleteTexPageSeries(char *names[], int num_textures, int local) {
       continue;
     }
     pagetype = cf_ReadByte(infile);
-    int len = cf_ReadInt(infile);
+    /* int len = */ cf_ReadInt(infile);
 
     // If not a texture page, just read it in and write it right back out
     if (pagetype != PAGETYPE_TEXTURE) {

model/newstyle.cpp

@@ -510,7 +510,6 @@ inline void RenderSubmodelLightmapFace(poly_model *pm, bsp_info *sm, int facenum
 inline void RenderSubmodelFaceFogged(poly_model *pm, bsp_info *sm, int facenum) {
   g3Point *pointlist[100];
   polyface *fp = &sm->faces[facenum];
-  int modelnum = sm - pm->submodel;
   int t;
 
   for (t = 0; t < fp->nverts; t++) {
@@ -561,7 +560,6 @@ inline void RenderSubmodelFaceFogged(poly_model *pm, bsp_info *sm, int facenum)
 inline void RenderSubmodelFaceSpecular(poly_model *pm, bsp_info *sm, int facenum) {
   g3Point *pointlist[100];
   polyface *fp = &sm->faces[facenum];
-  int modelnum = sm - pm->submodel;
   int t;
   bool smooth = 0;
 
@@ -623,7 +621,6 @@ inline void RenderSubmodelFaceSpecular(poly_model *pm, bsp_info *sm, int facenum
 // Draws a glowing cone of light that represents thrusters
 void DrawThrusterEffect(vector *pos, float r, float g, float b, vector *norm, float size, float length) {
   vector cur_pos = *pos;
-  float cur_length = 0;
   vector glow_pos[MAX_PARTS];
   float glow_size[MAX_PARTS];
   int total_parts = 0;
@@ -702,7 +699,6 @@ void RenderSubmodelFacesSorted(poly_model *pm, bsp_info *sm) {
 
   int rcount;
   int model_render_order[MAX_POLYGON_VECS];
-  int modelnum = sm - pm->submodel;
 
   ASSERT(sm->nverts < MAX_POLYGON_VECS);
 

model/polymodel.cpp

@@ -2441,8 +2441,6 @@ void SetModelAngles(poly_model *po, const float *normalized_angles) {
 
         // Now do a parametric adjustment on the angles
 
-        int cur_angle = 0;
-
         // If we're already at the high point of the interpolation then just
         // stuff some values
         if (cur_state == po->num_key_angles - 1) {
@@ -2555,7 +2553,6 @@ void SetModelInterpPos(poly_model *po, const float *normalized_pos) {
 
       // Now do a parametric adjustment on the positions
 
-      vector total_delta_pos = {0, 0, 0};
       vector subpos;
       vector final_pos;
 
@@ -3122,7 +3119,6 @@ int CountFacesInPolymodel(poly_model *pm) {
 // of that point
 void GetPolyModelPointInWorld(vector *dest, poly_model *pm, vector *wpos, matrix *orient, int subnum, vector *pos,
                               vector *norm) {
-  bsp_info *sm = &pm->submodel[subnum];
   float normalized_time[MAX_SUBOBJECTS];
   int i;
 
@@ -3174,8 +3170,6 @@ void GetPolyModelPointInWorld(vector *dest, poly_model *pm, vector *wpos, matrix
 
 void GetPolyModelPointInWorld(vector *dest, poly_model *pm, vector *wpos, matrix *orient, int subnum,
                               float *normalized_time, vector *pos, vector *norm) {
-  bsp_info *sm = &pm->submodel[subnum];
-
   ASSERT(!(pm->flags & PMF_NOT_RESIDENT));
 
   if (!pm->new_style)

module/module.cpp

@@ -233,7 +233,6 @@ bool mod_FreeModule(module *handle) {
 // mod_GetLastError to see if there was an error symstr is the name of the function you want to get the symbol for (Do
 // NOT give any pre/suffix to this name) parmbytes is the size (in bytes) of the parameter list the function should have
 MODPROCADDRESS mod_GetSymbol(module *handle, const char *symstr, uint8_t parmbytes) {
-  char buffer[256];
   MODPROCADDRESS sym;
   if (!handle) {
     ModLastError = MODERR_INVALIDHANDLE;
@@ -248,6 +247,7 @@ MODPROCADDRESS mod_GetSymbol(module *handle, const char *symstr, uint8_t parmbyt
     return nullptr;
   }
 #if defined(WIN32)
+  char buffer[256];
   // We need to first form the correct symbol name (for Windows)
   if (parmbytes == 255)
     sprintf(buffer, "%s", symstr);

netcon/descent3onlineclient/odtclient.cpp

@@ -440,7 +440,7 @@ int MainMultiplayerMenu() {
 
   // void HotSpotCreate(int item,int parentitem, int id, int key, int txtitemoff, int txtitemon, int x, int y, int w,
   // int h, int flags,int winnum)
-  void *exit_hs = DLLHotSpotCreate(main_wnd, 5, KEY_ESC, exit_off_text, exit_on_text, 33, 427, 70, 15, 0);
+  /* void *exit_hs = */ DLLHotSpotCreate(main_wnd, 5, KEY_ESC, exit_off_text, exit_on_text, 33, 427, 70, 15, 0);
 
   void *priv_hs = DLLHotSpotCreate(main_wnd, 6, 0, priv_msg_off_text, priv_msg_on_text, 328, 403, 170, 15, 0);
 
@@ -1188,7 +1188,7 @@ int SearchMasterTrackerGameMenu() {
   // Menu loop
   while (!exit_menu) {
     if (ChatStarted)
-      const char *p = GetChatText();
+      GetChatText();
 
     DLLDescentDefer();
 

netcon/inetfile/CFtp.cpp

@@ -134,7 +134,6 @@ CFtpGet::CFtpGet(char *URL, char *localfile, char *Username, char *Password) {
   }
   m_ListenSock = socket(AF_INET, SOCK_STREAM, 0);
   if (INVALID_SOCKET == m_ListenSock) {
-    int iWinsockErr = WSAGetLastError();
     m_State = FTP_STATE_SOCKET_ERROR;
     return;
   } else {
@@ -145,15 +144,13 @@ CFtpGet::CFtpGet(char *URL, char *localfile, char *Username, char *Password) {
     // Bind the listen socket
     if (bind(m_ListenSock, (SOCKADDR *)&listensockaddr, sizeof(SOCKADDR))) {
       // Couldn't bind the socket
-      int iWinsockErr = WSAGetLastError();
       m_State = FTP_STATE_SOCKET_ERROR;
       return;
     }
 
     // Listen for the server connection
     if (listen(m_ListenSock, 1)) {
       // Couldn't listen on the socket
-      int iWinsockErr = WSAGetLastError();
       m_State = FTP_STATE_SOCKET_ERROR;
       return;
     }
@@ -339,7 +336,6 @@ uint32_t CFtpGet::GetFile() {
   close(m_ListenSock);
 #endif
   if (m_DataSock == INVALID_SOCKET) {
-    int iWinsockErr = WSAGetLastError();
     m_State = FTP_STATE_SOCKET_ERROR;
     return 0;
   }
@@ -363,7 +359,6 @@ uint32_t CFtpGet::IssuePort() {
   // Get the address for the hListenSocket
   iLength = sizeof(listenaddr);
   if (getsockname(m_ListenSock, (SOCKADDR *)&listenaddr, &iLength) == SOCKET_ERROR) {
-    int iWinsockErr = WSAGetLastError();
     m_State = FTP_STATE_SOCKET_ERROR;
     return 0;
   }
@@ -374,7 +369,6 @@ uint32_t CFtpGet::IssuePort() {
   // Now, reuse the socket address structure to
   // get the IP address from the control socket.
   if (getsockname(m_ControlSock, (SOCKADDR *)&listenaddr, &iLength) == SOCKET_ERROR) {
-    int iWinsockErr = WSAGetLastError();
     m_State = FTP_STATE_SOCKET_ERROR;
     return 0;
   }
@@ -411,7 +405,6 @@ uint32_t CFtpGet::IssuePort() {
     if (nReplyCode != 250 || (ReadFTPServerReply() != 200)) // ummmmmmmm
 #endif
     {
-      int iWinsockErr = WSAGetLastError();
       m_State = FTP_STATE_SOCKET_ERROR;
       return 0;
     }
@@ -445,7 +438,6 @@ int CFtpGet::ConnectControlSocket() {
     return 0;
   // Now we will connect to the host
   if (connect(m_ControlSock, (SOCKADDR *)&hostaddr, sizeof(SOCKADDR))) {
-    int iWinsockErr = WSAGetLastError();
     m_State = FTP_STATE_CANT_CONNECT;
     return 0;
   }
@@ -479,7 +471,6 @@ uint32_t CFtpGet::SendFTPCommand(char *command) {
   FlushControlChannel();
   // Send the FTP command
   if (SOCKET_ERROR == (send(m_ControlSock, command, strlen(command), 0))) {
-    int iWinsockErr = WSAGetLastError();
     // Return 999 to indicate an error has occurred
     return (999);
   }
@@ -579,7 +570,6 @@ uint32_t CFtpGet::ReadDataChannel() {
 void CFtpGet::FlushControlChannel() {
   fd_set read_fds;
   TIMEVAL timeout;
-  int bytesin = 0;
   char flushbuff[3];
 
   timeout.tv_sec = 0;

netcon/mtclient/mt_net.cpp

@@ -182,7 +182,6 @@ void InitMTSockets() {
   }
 
   {
-    static HOSTENT lhe;
     memset(&sockaddr, 0, sizeof(SOCKADDR_IN));
     gtrackaddr.sin_family = AF_INET;
     gtrackaddr.sin_addr.s_addr = INADDR_ANY;