kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

relocate string sort functions

Browse Source
This commit is contained in:
ac-stef
2017-05-22 20:52:45 +02:00
parent 1afd7515ab
commit a97d69bc0e
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/command.cpp
-5
View File
@@ -1347,11 +1347,6 @@ char *strreplace(char *dest, const char *source, const char *search, const char
}
COMMANDF(strreplace, "sss", (const char *source, const char *search, const char *replace) { string d; result(strreplace(d, source, search, replace)); });
int stringsort(const char **a, const char **b) { return strcmp(*a, *b); }
int stringsortrev(const char **a, const char **b) { return strcmp(*b, *a); }
int stringsortignorecase(const char **a, const char **b) { return strcasecmp(*a, *b); }
int stringsortignorecaserev(const char **a, const char **b) { return strcasecmp(*b, *a); }
void sortlist(char *list)
{
vector<char *> elems;
source/src/protos.h
-4
View File
@@ -926,10 +926,6 @@ extern void renderdoc(int x, int y, int doch);
extern void renderdocmenu(void *menu, bool init);
extern void toggledoc();
extern void scrolldoc(int i);
extern int stringsort(const char **a, const char **b);
extern int stringsortrev(const char **a, const char **b);
extern int stringsortignorecase(const char **a, const char **b);
extern int stringsortignorecaserev(const char **a, const char **b);
extern const char *docgetdesc(const char *name);
#endif
source/src/tools.cpp
+4
View File
@@ -320,6 +320,10 @@ const char *rateentitystats(entitystats_s &es)
int cmpintasc(const int *a, const int *b) { return *a - *b; } // leads to ascending sort order
int cmpintdesc(const int *a, const int *b) { return *b - *a; } // leads to descending sort order
int stringsort(const char **a, const char **b) { return strcmp(*a, *b); }
int stringsortrev(const char **a, const char **b) { return strcmp(*b, *a); }
int stringsortignorecase(const char **a, const char **b) { return strcasecmp(*a, *b); }
int stringsortignorecaserev(const char **a, const char **b) { return strcasecmp(*b, *a); }
extern char *maplayout, *testlayout;
extern int maplayout_factor, testlayout_factor, Mvolume, Marea, Mopen, SHhits;
source/src/tools.h
+8 -2
View File
@@ -22,9 +22,11 @@ typedef unsigned int uint;
#include <iostream>
#define DEBUG(v) if(DEBUGCOND) { std::cout << behindpath(__FILE__) << ":" << __LINE__ << " " << __FUNCTION__ << "(..) " << v << std::endl; }
#define DEBUGVAR(v) if(DEBUGCOND) { std::cout << behindpath(__FILE__) << ":" << __LINE__ << " " << __FUNCTION__ << "(..) " << #v << " = " << v << std::endl; }
#define DEBUGCODE(v) v
#else
#define DEBUG(v) {}
#define DEBUGVAR(v) {}
#define DEBUGCODE(v)
#define ASSERT(c) if(c) {}
#endif
@@ -949,8 +951,12 @@ extern void parseupdatelist(hashtable<const char *, int> &ht, char *buf, const c
struct twoint { int key, val; };
struct threeint { int key, val1, val2; };
int cmpintasc(const int *a, const int *b); // leads to ascending sort order
int cmpintdesc(const int *a, const int *b); // leads to descending sort order
extern int cmpintasc(const int *a, const int *b); // leads to ascending sort order
extern int cmpintdesc(const int *a, const int *b); // leads to descending sort order
extern int stringsort(const char **a, const char **b);
extern int stringsortrev(const char **a, const char **b);
extern int stringsortignorecase(const char **a, const char **b);
extern int stringsortignorecaserev(const char **a, const char **b);
#if defined(WIN32) && !defined(_DEBUG) && !defined(__GNUC__)
extern void stackdumper(unsigned int type, EXCEPTION_POINTERS *ep);