removing old vector typedefs

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4788 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/client.cpp

@@ -543,7 +543,7 @@ void gets2c()           // get updates from the server
 
 // sendmap/getmap commands, should be replaced by more intuitive map downloading
 
-cvector securemaps;
+vector<char *> securemaps;
 
 void resetsecuremaps() { securemaps.deletearrays(); }
 void securemap(char *map) { if(map) securemaps.add(newstring(map)); }

source/src/cube.h

@@ -18,11 +18,6 @@
  #include "console.h"
 #endif
 
-typedef vector<char *> cvector;
-typedef vector<int> ivector;
-
-// globals ooh naughty
-
 extern sqr *world, *wmip[];             // map data, the mips are sequential 2D arrays in memory
 extern header hdr;                      // current map header
 extern int sfactor, ssize;              // ssize = 2^sfactor

source/src/docs.cpp

@@ -63,7 +63,7 @@ struct docident
 {
     char *name, *desc;
     vector<docargument> arguments;
-    cvector remarks;
+    vector<char *> remarks;
     vector<docref> references;
     vector<docexample> examples;
     vector<dockey> keys;
@@ -187,7 +187,7 @@ void listundoneidents(vector<const char *> &inames, int allidents)
             docident *id = docidents.access(name);
             if(id) // search for substrings that indicate undoneness
             {
-                cvector srch;
+                vector<char *> srch;
                 srch.add(id->name);
                 srch.add(id->desc);
                 loopvj(id->remarks) srch.add(id->remarks[j]);
@@ -235,7 +235,7 @@ void docfind(char *search)
 {
     enumerate(docidents, docident, i,
     {
-        cvector srch;
+        vector<char *> srch;
         srch.add(i.name);
         srch.add(i.desc);
         loopvk(i.remarks) srch.add(i.remarks[k]);

source/src/menus.cpp

@@ -1003,7 +1003,7 @@ void gmenu::init()
     if(dirlist)
     {
         items.deletecontents();
-        cvector files;
+        vector<char *> files;
         listfiles(dirlist->dir, dirlist->ext, files);
         files.sort(stringsort);
         loopv(files)

source/src/rendermodel.cpp

@@ -652,7 +652,7 @@ VARP(teamdisplaymode, 0, 1, 2);
 
 #define SKINBASE "packages/models/playermodels"
 VARP(hidecustomskins, 0, 0, 2);
-static cvector playerskinlist;
+static vector<char *> playerskinlist;
 
 const char *getclientskin(const char *name, const char *suf)
 {

source/src/server.cpp

@@ -936,7 +936,7 @@ int arenaround = 0, arenaroundstartmillis = 0;
 struct twoint { int index, value; };
 int cmpscore(const int *a, const int *b) { return clients[*a]->at3_score - clients[*b]->at3_score; }
 int cmptwoint(const struct twoint *a, const struct twoint *b) { return a->value - b->value; }
-ivector tdistrib;
+vector<int> tdistrib;
 vector<twoint> sdistrib;
 
 void distributeteam(int team)
@@ -1472,7 +1472,7 @@ int calcscores() // skill eval
     return sum;
 }
 
-ivector shuffle;
+vector<int> shuffle;
 
 void shuffleteams(int ftr = FTR_AUTOTEAM)
 {

source/src/sound.h

@@ -358,7 +358,7 @@ class audiomanager
 {
     bool nosound;
     float currentpitch;
-	cvector musics;
+	vector<char *> musics;
     ALCdevice *device;
     ALCcontext *context;
 

source/src/tools.h

@@ -471,10 +471,6 @@ template <class T> struct vector
     }
 };
 
-typedef vector<char *> cvector;
-typedef vector<int> ivector;
-typedef vector<ushort> usvector;
-
 static inline uint hthash(const char *key)
 {
     uint h = 5381;

source/src/worldio.cpp

@@ -770,7 +770,7 @@ void listmapdependencies_all(int sure)
 
     stream *f = openfile(MAPDEPFILENAME, "w");
     delete f;
-    cvector files;
+    vector<char *> files;
     listfiles("packages/maps", "cgz", files);
     listfiles("packages/maps/official", "cgz", files);
     files.sort(stringsort);