Update of /cvsroot/moeng/BBRpg/src/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28988/src/editor
Modified Files:
editor.cpp main.cpp
Log Message:
Merged engine changes from DGE RPG agian.
Index: main.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/editor/main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.cpp 13 Apr 2004 12:26:08 -0000 1.8
--- main.cpp 25 Apr 2004 16:39:52 -0000 1.9
***************
*** 116,128 ****
gui_text_list_proc = d_agup_text_list_proc;
! DATAFILE* font_data = load_datafile_object("gui.dat", "SmallFont");
if (font_data) font = (FONT*)font_data->dat;
engine_font = font;
! DATAFILE* mouse_pointer = load_datafile_object("gui.dat", "_MS_STD_BMP");
if (mouse_pointer) set_mouse_sprite((BITMAP*)mouse_pointer->dat);
! DATAFILE* logo = load_datafile_object("gui.dat", "MoonlightLogo");
if (logo) about_dlg[1].dp = (BITMAP*)logo->dat;
else console.log(CON_QUIT, CON_ALWAYS, "Error loading MoonlightLogo");
--- 116,130 ----
gui_text_list_proc = d_agup_text_list_proc;
! engine_data = load_datafile("gui.dat");
!
! DATAFILE* font_data = find_datafile_object(engine_data, "SmallFont");
if (font_data) font = (FONT*)font_data->dat;
engine_font = font;
! DATAFILE* mouse_pointer = find_datafile_object(engine_data, "_MS_STD_BMP");
if (mouse_pointer) set_mouse_sprite((BITMAP*)mouse_pointer->dat);
! DATAFILE* logo = find_datafile_object(engine_data, "MoonlightLogo");
if (logo) about_dlg[1].dp = (BITMAP*)logo->dat;
else console.log(CON_QUIT, CON_ALWAYS, "Error loading MoonlightLogo");
***************
*** 130,137 ****
console.log(CON_LOG, CON_ALWAYS, "Loading module \"data\"...");
module = new Module("data");
- //data = load_datafile("data.dat");
- //if (!data) {
- // console.log(CON_QUIT, CON_ALWAYS, "Error while loading: data.dat");
- //}
// Lua initialisation
--- 132,135 ----
***************
*** 288,291 ****
--- 286,290 ----
destroy_bitmap(buffer);
+ unload_datafile(engine_data);
agup_shutdown();
Index: editor.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/editor/editor.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** editor.cpp 13 Apr 2004 12:26:08 -0000 1.9
--- editor.cpp 25 Apr 2004 16:39:52 -0000 1.10
***************
*** 32,35 ****
--- 32,36 ----
int debug_mode = 0;
FONT* engine_font = NULL;
+ DATAFILE *engine_data = NULL;
list<Object*> selectedObjects;
int selectedObjectType = 0;
|
