This commit only updates the XCode project for the changes. A later commit each will update it for scons and MSVC. A few actual changes are mixed in: - Add a prefix header for a handful of common definitions - Moved current_cursor into the Cursor class as a static member - Removed the make_cursor_sword and make_cursor_watch functions - Include tests in the All target - Remove redundant -l flags for Common and Common-Party (since they're included in the Link phases anyway)
66 lines
1.0 KiB
C++
66 lines
1.0 KiB
C++
/*
|
|
* mathutil.cpp
|
|
* BoE
|
|
*
|
|
* Created by Celtic Minstrel on 16/04/09.
|
|
*
|
|
*/
|
|
|
|
#include <cstdlib>
|
|
#include "mathutil.hpp"
|
|
|
|
short get_ran (short times,short min,short max){
|
|
long int store;
|
|
short to_ret = 0;
|
|
|
|
if(max < min) max = min;
|
|
if(max == min) return times * min;
|
|
|
|
for(short i = 1; i < times + 1; i++) {
|
|
store = rand();
|
|
to_ret += min + (store % (max - min + 1));
|
|
}
|
|
return to_ret;
|
|
}
|
|
|
|
short max(short a,short b){
|
|
if(a > b)
|
|
return a;
|
|
else return b;
|
|
}
|
|
|
|
short min(short a,short b){
|
|
if(a < b)
|
|
return a;
|
|
else return b;
|
|
}
|
|
|
|
short minmax(short min,short max,short k){
|
|
if(k < min)
|
|
return min;
|
|
if(k > max)
|
|
return max;
|
|
return k;
|
|
}
|
|
|
|
short gcd(short a, short b){ // Grabbed from Wikipedia and translated to C code
|
|
short t;
|
|
while(b != 0){
|
|
t = b;
|
|
b = a % b;
|
|
a = t;
|
|
}
|
|
return a;
|
|
}
|
|
|
|
// According to Macintosh Toolbox Essentials, a tick is about 1/60ths of a second.
|
|
sf::Time time_in_ticks(int ticks) {
|
|
unsigned long long micro = ticks;
|
|
micro *= 1000;
|
|
micro *= 1000;
|
|
micro /= 60;
|
|
return sf::microseconds(micro);
|
|
}
|
|
|
|
|