Permalink
Browse files

Add -javaloop switch to have a potentially pure Java main loop.

  • Loading branch information...
RestlessRodent committed Feb 6, 2017
1 parent 40eb776 commit 99528262fb06c971e26cae46ae7cba54aca40d84
Showing with 6 additions and 8 deletions.
  1. +6 −1 java/core/org/remood/remood/Main.java
  2. +0 −7 src/g_game.c
@@ -143,7 +143,12 @@ public String getEnvironment(String __env)
*/
public int run()
{
return __cMain(this._args);
// Use old C based loop
if (null == this.cmdline.get("-javaloop"))
return __cMain(this._args);
// Otherwise, a Java based one
throw new Error("TODO");
}
/**
View
@@ -1771,13 +1771,6 @@ void G_DeferedInitNew(skill_t skill, char *mapname, int StartSplitScreenGame)
// called at : map cmd execution, doloadgame, doplaydemo
void G_InitNew(skill_t skill, char *mapname, boolean resetplayer)
{
jclass gameclass;
// If a new game was not initialized, then make it
gameclass = J_FindClass("org/remood/remood/game/Game");
if (currentgame == NULL)
currentgame = J_NewObject(gameclass, J_GetMethodID(gameclass, "<init>", "()V"));
//added:27-02-98: disable selected features for compatibility with
// older demos, plus reset new features as default
if (!G_Downgrade(demoversion))

0 comments on commit 9952826

Please sign in to comment.