mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

improved SDL_GetTicks without SDL, and getticks() replaced with it

Browse Source
This commit is contained in:
Zeno Rogue 2018-07-23 05:16:16 +02:00
parent ba92dd4b32
commit ce08ec2a1f
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fake-mobile.cpp
View File

@ -86,8 +86,6 @@ int textwidth(int siz, const string &str) {
char action; char action;
int getticks() { return SDL_GetTicks(); }
bool currentlyConnecting() { return false; } bool currentlyConnecting() { return false; }
bool currentlyConnected() { return false; } bool currentlyConnected() { return false; }
void viewAchievements() { printf("view Achievements\n"); } void viewAchievements() { printf("view Achievements\n"); }

2
hyperroid/app/src/main/jni/hyper.cpp
View File

@ -276,8 +276,6 @@ void shareScore(MOBPAR_FORMAL) {
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
} }
int nticks; int getticks() { return nticks; }
extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) { extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) {
// if(debfile) fprintf(debfile, "draw started.\n"), fflush(debfile); // if(debfile) fprintf(debfile, "draw started.\n"), fflush(debfile);

4
init.cpp
View File

@ -223,8 +223,6 @@ void handleclick(MOBPAR_FORMAL) {
int touchedAt; int touchedAt;
int getticks();
#if CAP_ANDROIDSHARE #if CAP_ANDROIDSHARE
void shareScore(MOBPAR_FORMAL); void shareScore(MOBPAR_FORMAL);
#endif #endif
@ -233,7 +231,7 @@ void mobile_draw(MOBPAR_FORMAL) {
optimizeview(); optimizeview();
int lastt = ticks; ticks = getticks(); int lastt = ticks; ticks = SDL_GetTicks();
if(lastt > ticks) lastt = ticks; if(lastt > ticks) lastt = ticks;
int tdiff = ticks - lastt; int tdiff = ticks - lastt;

21
util.cpp
View File

@ -6,16 +6,21 @@
namespace hr { namespace hr {
#if CAP_TIMEOFDAY #if CAP_TIMEOFDAY
long long getms() { #if !CAP_SDL
struct timeval tval; int lastusec;
gettimeofday(&tval, NULL); int uticks;
return tval.tv_sec * 1000000 + tval.tv_usec;
int SDL_GetTicks() {
struct timeval tim;
gettimeofday(&tim, NULL);
int newusec = tim.tv_usec;
uticks += newusec - lastusec;
if(newusec <= lastusec)
uticks += 1000000;
lastusec = newusec;
return uticks / 1000;
} }
#if !CAP_SDL
int SDL_GetTicks() {
return getms() / 1000;
}
#endif #endif
#endif #endif