Merge pull request #720 from jengelh/Wchar

Resolve 160 instances of -Wchar-subscript

Author: Lgt2x

Descent3/AIGoal.cpp

@@ -463,6 +463,7 @@
  * $NoKeywords: $
  */
 
+#include <cstdint>
 #include <cstdlib>
 
 #include "AIGoal.h"
@@ -1096,7 +1097,7 @@ int GoalAddGoal(object *obj, uint32_t goal_type, void *arg_struct, int level, fl
     if ((ai_info->animation_type == AS_ALERT) || (ai_info->animation_type == AS_MELEE1 + 1) ||
         (ai_info->animation_type == AS_MELEE2 + 1)) {
       uint8_t m_num = attack_info->melee_number;
-      char new_anim;
+      int8_t new_anim;
 
       if (m_num)
         new_anim = AS_MELEE1;
@@ -1116,7 +1117,7 @@ int GoalAddGoal(object *obj, uint32_t goal_type, void *arg_struct, int level, fl
     break;
 
   case AIG_SET_ANIM: {
-    char new_anim = *((int *)arg_struct);
+    int8_t new_anim = *static_cast<int *>(arg_struct);
     polyobj_info *p_info = &obj->rtype.pobj_info;
 
     //			mprintf(0, "Anim Goal %d\n", new_anim);

Descent3/AImain.cpp

@@ -1507,6 +1507,7 @@
  * $NoKeywords: $
  */
 
+#include <cstdint>
 #include <cstdlib>
 
 #include "AIMain.h"
@@ -3346,7 +3347,7 @@ void ai_do_animation(object *obj, float anim_time) {
     }
   } else {
     if (obj->ai_info->animation_type == AS_RANGED_ATTACK) {
-      char wb = obj->ai_info->last_special_wb_firing;
+      int8_t wb = obj->ai_info->last_special_wb_firing;
 
       if (Object_info[obj->id].static_wb[wb].flags & WBF_SPRAY) {
         obj->weapon_fire_flags |= WFF_SPRAY;
@@ -6059,7 +6060,7 @@ void AIDoFrame(object *obj) {
   // Handle On/off and spray weapons
   {
     if ((obj->weapon_fire_flags & WFF_SPRAY) && !(obj->flags & (OF_DESTROYED | OF_DYING))) {
-      char wb_index = ai_info->last_special_wb_firing;
+      int8_t wb_index = ai_info->last_special_wb_firing;
       DoSprayEffect(obj, &Object_info[obj->id].static_wb[wb_index], wb_index);
       if (!((Game_mode & GM_MULTI) && (Netgame.local_role == LR_CLIENT))) {
         if (WBIsBatteryReady(obj, &Object_info[obj->id].static_wb[wb_index], wb_index) &&

Descent3/LoadLevel.cpp

@@ -3165,7 +3165,7 @@ void ReadRoomAABBChunk(CFILE *fp, int version) {
       Rooms[i].bbf_list = mem_rmalloc<int16_t *>(Rooms[i].num_bbf_regions);
       Rooms[i].bbf_list_min_xyz = mem_rmalloc<vector>(Rooms[i].num_bbf_regions);
       Rooms[i].bbf_list_max_xyz = mem_rmalloc<vector>(Rooms[i].num_bbf_regions);
-      Rooms[i].bbf_list_sector = mem_rmalloc<uint8_t>(sizeof(char) * Rooms[i].num_bbf_regions);
+      Rooms[i].bbf_list_sector = mem_rmalloc<uint8_t>(Rooms[i].num_bbf_regions);
 
       for (j = 0; j < Rooms[i].num_bbf_regions; j++) {
         Rooms[i].num_bbf[j] = cf_ReadShort(fp);

Descent3/PilotPicsAPI.cpp

@@ -59,6 +59,7 @@
  */
 
 #include <algorithm>
+#include <cstdint>
 #include <cstdlib>
 #include <cstdio>
 
@@ -561,7 +562,7 @@ bool PPic_BuildDatabases(void) {
     Pilot_id_to_offset[count].offset = file_pos;
     Pilot_id_to_offset[count].id = pilot_id;
 
-    char let_pos;
+    int8_t let_pos;
     if (isalpha(name_buffer[0])) {
       let_pos = toupper(name_buffer[0]) - 'A';
     } else {

Descent3/TelComGoals.cpp

@@ -140,7 +140,7 @@ static int TG_MouseOffset_x = -1, TG_MouseOffset_y = -1;
 bool TG_compare_slots(int left, int right) {
   int left_index, right_index;
   int left_priority, right_priority;
-  char left_list, right_list;
+  int8_t left_list, right_list;
 
   left_index = TG_Lines[left].goal_index;
   right_index = TG_Lines[right].goal_index;

Descent3/aiambient.cpp

@@ -16,6 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cstdint>
 #include <stdlib.h>
 #include "aiambient.h"
 #include "string.h"
@@ -30,7 +31,7 @@ ambient_life a_life;
 void ambient_life::DoFrame(void) {}
 
 void ambient_life::InitForLevel(void) {
-  char i;
+  int8_t i;
 
   for (i = 0; i < MAX_AL_TYPES; i++) {
     ComputeNextSize(i);
@@ -41,7 +42,7 @@ void ambient_life::InitForLevel(void) {
   DoFrame();
 }
 
-void ambient_life::GetALValue(char i, char field, void *ptr) {
+void ambient_life::GetALValue(int8_t i, char field, void *ptr) {
   switch (field) {
   case ALI_TYPE:
     *((int *)ptr) = m_type[i];
@@ -61,7 +62,7 @@ void ambient_life::GetALValue(char i, char field, void *ptr) {
   }
 }
 
-void ambient_life::ComputeNextSize(char i) {
+void ambient_life::ComputeNextSize(int8_t i) {
   char diff = m_max[i] - m_min[i];
   if (diff > 0) {
     char offset = ps_rand() % diff;
@@ -71,7 +72,7 @@ void ambient_life::ComputeNextSize(char i) {
   }
 }
 
-void ambient_life::SetALValue(char i, char field, void *ptr) {
+void ambient_life::SetALValue(int8_t i, char field, void *ptr) {
   switch (field) {
   case ALI_TYPE:
     m_type[i] = *((int *)ptr);

Descent3/aiambient.h

@@ -19,6 +19,7 @@
 #ifndef _AIAMBIENT_H_
 #define _AIAMBIENT_H_
 
+#include <cstdint>
 #include "cfile.h"
 
 #define MAX_AL_TYPES 6
@@ -51,13 +52,13 @@ class ambient_life {
   uint8_t m_next_size[MAX_AL_TYPES];
   float m_next_do_time[MAX_AL_TYPES];
 
-  void ComputeNextSize(char index);
+  void ComputeNextSize(int8_t index);
 
 public:
   ambient_life() { ALReset(); }
 
-  void GetALValue(char index, char field, void *ptr);
-  void SetALValue(char index, char field, void *ptr);
+  void GetALValue(int8_t index, char field, void *ptr);
+  void SetALValue(int8_t index, char field, void *ptr);
   void SaveData(CFILE *fptr);
   void LoadData(CFILE *fptr);
 

Descent3/aistruct.h

@@ -392,6 +392,7 @@
 #ifndef AISTRUCT_H_
 #define AISTRUCT_H_
 
+#include <cstdint>
 #include "pstypes.h"
 #include "vecmat.h"
 #include "aistruct_external.h"
@@ -759,10 +760,9 @@ struct ai_frame {
   float last_sound_time[MAX_AI_SOUNDS];
   int16_t last_played_sound_index;
 
-  char movement_type;
-  char movement_subtype;
+  int8_t movement_type, movement_subtype;
 
-  char animation_type;
+  int8_t animation_type;
   char next_animation_type;
 
   char next_movement; // For queueing actions  :)

Descent3/attach.cpp

@@ -16,6 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cstdint>
 #include "attach.h"
 #include "terrain.h"
 #include "log.h"
@@ -142,7 +143,7 @@ PI); rot_angle = acos(dot);
 
 // Finds the position of a attach point on an object
 // The uvec is optional as most attaching objects don't need at complete orientation set (only an fvec)
-static bool AttachPointPos(object *obj, char ap, bool f_compute_pos, vector *attach_pos, bool f_compute_fvec,
+static bool AttachPointPos(object *obj, int8_t ap, bool f_compute_pos, vector *attach_pos, bool f_compute_fvec,
                            vector *attach_fvec, bool *f_computed_uvec = NULL, vector *attach_uvec = NULL) {
   poly_model *pm;
   vector pnt;
@@ -459,7 +460,7 @@ static void ProprogateUltimateAttachParent(object *parent, int ultimate_handle)
 
 // Attaches 2 objects via attach points on each.  The f_used_aligned allows for an aligned connection.
 // NOTE: The child always moves to the parent
-bool AttachObject(object *parent, char parent_ap, object *child, char child_ap, bool f_use_aligned) {
+bool AttachObject(object *parent, int8_t parent_ap, object *child, char child_ap, bool f_use_aligned) {
   ASSERT(parent);
   ASSERT(child);
 
@@ -510,7 +511,7 @@ bool AttachObject(object *parent, char parent_ap, object *child, char child_ap,
 
 // Attaches a child object to a parent object by a percent of the radius of the child.
 // NOTE: The child always moves to the parent and not the reverse
-bool AttachObject(object *parent, char parent_ap, object *child, float percent_rad) {
+bool AttachObject(object *parent, int8_t parent_ap, object *child, float percent_rad) {
   ASSERT(parent);
   ASSERT(child);
 
@@ -661,7 +662,7 @@ bool UnattachFromParent(object *child) {
 }
 
 // Unattaches a child from an attach point
-bool UnattachChild(object *parent, char parent_ap) {
+bool UnattachChild(object *parent, int8_t parent_ap) {
   object *child;
 
   if ((child = ObjGet(parent->attach_children[parent_ap])) != NULL) {

Descent3/attach.h

@@ -19,17 +19,18 @@
 #ifndef _ATTACH_H_
 #define _ATTACH_H_
 
+#include <cstdint>
 #include "object.h"
 
 bool AttachDoPosOrient(object *parent, char parent_ap, object *child, char child_ap, bool f_parent,
                        bool f_move_obj = true, vector *pos = NULL, matrix *orient = NULL, bool f_dropping_off = false);
 bool AttachDoPosOrientRad(object *parent, char p_ap, object *child, float rad_percent, vector *pos);
 void AttachUpdateSubObjects(object *obj);
 
-bool AttachObject(object *parent, char parent_ap, object *child, char child_ap, bool f_use_aligned = false);
-bool AttachObject(object *parent, char parent_ap, object *child, float percent_rad);
+bool AttachObject(object *parent, int8_t parent_ap, object *child, char child_ap, bool f_use_aligned = false);
+bool AttachObject(object *parent, int8_t parent_ap, object *child, float percent_rad);
 bool UnattachFromParent(object *child);
-bool UnattachChild(object *parent, char parent_ap);
+bool UnattachChild(object *parent, int8_t parent_ap);
 bool UnattachChildren(object *parent);
 
 #endif