[Moeng-cvs] BBRpg/src common.h,1.3,1.4 rpg.cpp,1.10,1.11

[Bj?rn L. <b_l...@us...>]

Update of /cvsroot/moeng/BBRpg/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28988/src

Modified Files:
	common.h rpg.cpp 
Log Message:
Merged engine changes from DGE RPG agian.


Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rpg.cpp	13 Apr 2004 12:26:08 -0000	1.10
--- rpg.cpp	25 Apr 2004 16:39:52 -0000	1.11
***************
*** 39,45 ****
  bool bDoubleSize = false;
  char filename[256];
! DATAFILE *interface_graphics;
! Module *module;
! FONT* engine_font;
  int gameClassInstance = 0;
  
--- 39,45 ----
  bool bDoubleSize = false;
  char filename[256];
! DATAFILE *engine_data = NULL;
! Module *module = NULL;
! FONT* engine_font = NULL;
  int gameClassInstance = 0;
  
***************
*** 167,177 ****
  
      console.log(CON_LOG, CON_ALWAYS, "Loading gui.dat...");
!     interface_graphics = load_datafile("gui.dat");
!     if (!interface_graphics) {
          console.log(CON_QUIT, CON_ALWAYS, "Error while loading: gui.dat");
      }
  
      // Set font to use
!     DATAFILE *temp = find_datafile_object(interface_graphics, "SmallFont");
      if (temp) {engine_font = ((FONT *)temp->dat);}
  
--- 167,177 ----
  
      console.log(CON_LOG, CON_ALWAYS, "Loading gui.dat...");
!     engine_data = load_datafile("gui.dat");
!     if (!engine_data) {
          console.log(CON_QUIT, CON_ALWAYS, "Error while loading: gui.dat");
      }
  
      // Set font to use
!     DATAFILE *temp = find_datafile_object(engine_data, "SmallFont");
      if (temp) {engine_font = ((FONT *)temp->dat);}
  
***************
*** 323,327 ****
  
      console.log(CON_LOG, CON_ALWAYS, "Unloading datafiles...");
!     unload_datafile(interface_graphics);
  
      delete module;
--- 323,327 ----
  
      console.log(CON_LOG, CON_ALWAYS, "Unloading datafiles...");
!     unload_datafile(engine_data);
  
      delete module;

Index: common.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** common.h	9 Dec 2003 01:42:46 -0000	1.3
--- common.h	25 Apr 2004 16:39:52 -0000	1.4
***************
*** 17,22 ****
  #include "shared/tiled_map.h"
  
! extern int debug_mode;						// Show debug info
  
  extern FONT *engine_font;
  extern Console console;
--- 17,23 ----
  #include "shared/tiled_map.h"
  
! extern int debug_mode;                    // Show debug info
  
+ extern DATAFILE *engine_data;
  extern FONT *engine_font;
  extern Console console;