X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qh;h=81acde950eba2fc63cd450375f0bcebb9c1e7b16;hb=a73f79e356dd25b6ea678379e7884ee45cc1977b;hp=de2c32513b064f3c9e73dc116a7b75eea3b4e865;hpb=f52ddede69621c7c9d31983591902f47fd40d7d0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index de2c32513..81acde950 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -1,7 +1,7 @@ -#ifndef COMMON_UTIL_H -#define COMMON_UTIL_H +#pragma once #ifndef MENUQC + vector real_origin(entity ent); #endif @@ -10,7 +10,7 @@ vector real_origin(entity ent); string wordwrap(string s, float l); #ifndef MENUQC #ifndef CSQC -void wordwrap_sprint(string s, float l); +void wordwrap_sprint(entity to, string s, float l); #endif #endif void wordwrap_cb(string s, float l, void(string) callback); @@ -63,7 +63,6 @@ const float TIME_FACTOR = 100; string ScoreString(float vflags, float value); -void compressShortVector_init(); vector decompressShortVector(float data); float compressShortVector(vector vec); @@ -125,7 +124,7 @@ string getWrappedLine_remaining; string getWrappedLine(float w, vector size, textLengthUpToWidth_widthFunction_t tw); string getWrappedLineLen(float w, textLengthUpToLength_lenFunction_t tw); -float isGametypeInFilter(float gt, float tp, float ts, string pattern); +float isGametypeInFilter(entity gt, float tp, float ts, string pattern); string swapwords(string str, float i, float j); string shufflewords(string str); @@ -296,4 +295,3 @@ vector bezier_quadratic_getderivative(vector a, vector p, vector b, float t); // Returns the correct difference between two always increasing numbers #define COMPARE_INCREASING(to,from) (to < from ? from + to + 2 : to - from) -#endif