[Enigma-cvs] enigma/src world.cc,1.80,1.81

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv17934/src

Modified Files:
        world.cc 
Log Message:
Use new options:: code.  Use lua::LevelState instead of global state.


Index: world.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.cc,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** world.cc    12 Nov 2003 09:36:00 -0000      1.80
--- world.cc    16 Nov 2003 19:34:52 -0000      1.81
***************
*** 266,270 ****
      h = hh;
  
!     scrambleIntensity = options::Difficulty == DIFFICULTY_EASY ? 3 : 10;
  }
  
--- 266,270 ----
      h = hh;
  
!     scrambleIntensity = GetDifficulty() == DIFFICULTY_EASY ? 3 : 10;
  }
  
***************
*** 752,758 ****
      /* Restart the Lua environment so symbol definitions from
         different levels do not get in each other's way.*/
!     lua::Shutdown();
!     lua::Init();
!     lua::Dofile("init.lua");
  
      enigma::GameReset();
--- 752,758 ----
      /* Restart the Lua environment so symbol definitions from
         different levels do not get in each other's way.*/
!     lua::ShutdownLevel();
!     lua_State *L = lua::InitLevel();
!     lua::Dofile(L, "init.lua");
  
      enigma::GameReset();
***************
*** 772,776 ****
      level.reset();
      Repos_Shutdown();
!     lua::Shutdown();
  }
  
--- 772,776 ----
      level.reset();
      Repos_Shutdown();
!     lua::ShutdownLevel();
  }
  
***************
*** 1036,1040 ****
  
      if (action == "callback") {
!         lua::CallFunc(target.c_str(), Value(onoff));
      }
      else if (action == "signal") {
--- 1036,1040 ----
  
      if (action == "callback") {
!         lua::CallFunc(lua::LevelState, target.c_str(), Value(onoff));
      }
      else if (action == "signal") {