Merge pull request #4 from Earisu/master

Attempt to Merge Earisu's Hercules

1 files changed, 7 insertions, 7 deletions

diff --git a/src/common/core.c b/src/common/core.c
index 0959e6fc9..d6cfff662 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -307,7 +307,7 @@ int main (int argc, char **argv) {
 	}
 	core_defaults();
 	
-	malloclib->init();// needed for Show* in display_title() [FlavioJS]
+	iMalloc->init();// needed for Show* in display_title() [FlavioJS]
 	
 	console->display_title();
 	
@@ -322,14 +322,14 @@ int main (int argc, char **argv) {
 	Sql_Init();
 	rathread_init();
 	mempool_init();
-	DB->init();
+	iDB->init();
 	signals_init();
 	
 #ifdef _WIN32
 	cevents_init();
 #endif
 
-	timer_init();
+	iTimer->init();
 
 	console->init();
 
@@ -343,7 +343,7 @@ int main (int argc, char **argv) {
 	{// Main runtime cycle
 		int next;
 		while (runflag != CORE_ST_STOP) {
-			next = do_timer(gettick_nocache());
+			next = iTimer->do_timer(iTimer->gettick_nocache());
 			do_sockets(next);
 		}
 	}
@@ -354,14 +354,14 @@ int main (int argc, char **argv) {
 #ifndef MINICORE
 	HPM->final();
 #endif
-	timer_final();
+	iTimer->final();
 	socket_final();
-	DB->final();
+	iDB->final();
 	mempool_final();
 	rathread_final();
 #endif
 
-	malloclib->final();
+	iMalloc->final();
 
 	return 0;
 }