Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if (BUILD_FOR_NOKIA_NGAGE)
"${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_appview.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/ngage_document.cpp")

add_library(game STATIC ${project_sources} ${ngage_sources})
add_library(game STATIC ${project_sources})
add_library(open8 STATIC ${open8_sources})
build_exe_static(game exe ${UID1} ${UID2} ${UID3} "${game_static_libs}" "${game_libs}")
build_dll(open8 app ${UID1} ${UID2} ${APP_UID} "${open8_libs}")
Expand Down
3 changes: 0 additions & 3 deletions cmake/project_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ set(project_sources
${CMAKE_CURRENT_SOURCE_DIR}/src/lexaloffle/p8_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/src/lexaloffle/pxa_compress_snippets.c)

set(ngage_sources
${CMAKE_CURRENT_SOURCE_DIR}/src/ngage/api.cpp)

set(UID3 0x1000c37e) # game.exe UID
set(APP_UID 0x100051C0) # open8.app UID
set(APP_NAME "open8")
17 changes: 7 additions & 10 deletions src/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

static fix32_t seed_lo, seed_hi;

fix32_t seconds_since_start;
static fix32_t seconds_since_start;

// Auxiliary functions.

Expand Down Expand Up @@ -1404,19 +1404,16 @@ void init_api(lua_State* L)
lua_setglobal(L, "log");
}

#ifndef __SYMBIAN32__
#include <time.h>

void update_time(void)
{
static clock_t start_time = 0;
static Uint64 start_time = 0;
if (start_time == 0)
{
start_time = clock();
start_time = SDL_GetTicks();
}

clock_t current_time = clock();
double elapsed_time = (double)(current_time - start_time) / CLOCKS_PER_SEC;
seconds_since_start = fix32_from_double(elapsed_time);
Uint64 current_time = SDL_GetTicks();
Uint64 elapsed_time_ticks = current_time - start_time;
fix32_t elapsed_time = fix32_from_int(elapsed_time_ticks) / 1000;
seconds_since_start = elapsed_time;
}
#endif
34 changes: 0 additions & 34 deletions src/ngage/api.cpp

This file was deleted.

Loading