[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dialogue.py,1.1,1.2
|
From: |
Kai Sterker <address@hidden> |
|
Subject: |
[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dialogue.py,1.1,1.2 dlg_arrow.cc,1.1,1.2 dlg_arrow.h,1.1,1.2 dlg_circle.cc,1.1,1.2 dlg_circle.h,1.1,1.2 dlg_circle_entry.cc,1.1,1.2 dlg_circle_entry.h,1.1,1.2 dlg_compiler.cc,1.1,1.2 dlg_compiler.h,1.1,1.2 dlg_module.cc,1.1,1.2 dlg_module.h,1.1,1.2 dlg_module_entry.cc,1.1,1.2 dlg_module_entry.h,1.1,1.2 dlg_mover.cc,1.1,1.2 dlg_mover.h,1.1,1.2 dlg_node.cc,1.1,1.2 dlg_node.h,1.1,1.2 dlg_node_gfx.h,1.1,1.2 dlg_point.cc,1.1,1.2 dlg_point.h,1.1,1.2 dlg_rect.cc,1.1,1.2 dlg_rect.h,1.1,1.2 dlg_types.h,1.1,1.2 gui_circle.cc,1.1,1.2 gui_circle.h,1.1,1.2 gui_circle_events.cc,1.1,1.2 gui_circle_events.h,1.1,1.2 gui_code.cc,1.1,1.2 gui_code.h,1.1,1.2 gui_dlgedit.cc,1.1,1.2 gui_dlgedit.h,1.1,1.2 gui_dlgedit_events.cc,1.1,1.2 gui_dlgedit_events.h,1.1,1.2 gui_edit.cc,1.1,1.2 gui_edit.h,1.1,1.2 gui_error.cc,1.1,1.2 gui_error.h,1.1,1.2 gui_file.cc,1.1,1.2 gui_file.h,1.1,1.2 gui_graph.cc,1.1,1.2 gui_graph.h,1.1,1.2 gui_graph_events.cc,1.1,1.2 gui_graph_events.h,1.1,1.2 gui_list.cc,1.1,1.2 gui_list.h,1.1,1.2 gui_list_events.cc,1.1,1.2 gui_list_events.h,1.1,1.2 gui_messages.cc,1.1,1.2 gui_messages.h,1.1,1.2 gui_modal_dialog.cc,1.1,1.2 gui_modal_dialog.h,1.1,1.2 gui_settings.cc,1.1,1.2 gui_settings.h,1.1,1.2 gui_tooltip.cc,1.1,1.2 gui_tooltip.h,1.1,1.2 Makefile.am,1.41,1.42 lex.loadlg.cc,1.12,1.13 loadlg.l,1.9,1.10 main.cc,1.52,1.53 |
|
Date: |
Sun, 07 Apr 2002 05:51:34 -0400 |
Update of /cvsroot/adonthell/adonthell/src/tools/dlgedit
In directory subversions:/tmp/cvs-serv32214/src/tools/dlgedit
Modified Files:
Makefile.am lex.loadlg.cc loadlg.l main.cc
Added Files:
dialogue.py dlg_arrow.cc dlg_arrow.h dlg_circle.cc
dlg_circle.h dlg_circle_entry.cc dlg_circle_entry.h
dlg_compiler.cc dlg_compiler.h dlg_module.cc dlg_module.h
dlg_module_entry.cc dlg_module_entry.h dlg_mover.cc
dlg_mover.h dlg_node.cc dlg_node.h dlg_node_gfx.h dlg_point.cc
dlg_point.h dlg_rect.cc dlg_rect.h dlg_types.h gui_circle.cc
gui_circle.h gui_circle_events.cc gui_circle_events.h
gui_code.cc gui_code.h gui_dlgedit.cc gui_dlgedit.h
gui_dlgedit_events.cc gui_dlgedit_events.h gui_edit.cc
gui_edit.h gui_error.cc gui_error.h gui_file.cc gui_file.h
gui_graph.cc gui_graph.h gui_graph_events.cc
gui_graph_events.h gui_list.cc gui_list.h gui_list_events.cc
gui_list_events.h gui_messages.cc gui_messages.h
gui_modal_dialog.cc gui_modal_dialog.h gui_settings.cc
gui_settings.h gui_tooltip.cc gui_tooltip.h
Log Message:
PREPARED code for i18n and ttf support
CHANGED game class and initialization
ADDED new dlgedit
Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** Makefile.am 10 Oct 2001 17:32:53 -0000 1.41
--- Makefile.am 7 Apr 2002 09:51:28 -0000 1.42
***************
*** 7,32 ****
SUBDIRS = examples
! EXTRA_DIST = loadlg.l ins_dlgedit_modules.py py_character.i py_quest.i
character.py quest.py
!
! dlgedit_SOURCES = callbacks.cc circle.cc crcle_callbacks.cc \
! crcle_interface.cc dbg_callbacks.cc dbg_interface.cc debug.cc \
! dlgcompile.cc dlgnode.cc events.cc function.cc geometrie.cc \
! graph.cc lex.loadlg.cc interface.cc main.cc preset.cc py_character_wrap.cc \
! py_quest_wrap.cc ps_callbacks.cc ps_dlg.cc ps_interface.cc pset_callbacks.cc \
! pset_interface.cc run.cc run_callbacks.cc run_interface.cc \
! callbacks.h circle.h crcle_callbacks.h crcle_interface.h \
! dbg_callbacks.h dbg_interface.h debug.h dlgcompile.h dlgnode.h \
! events.h function.h geometrie.h graph.h interface.h main.h \
! preset.h ps_callbacks.h ps_dlg.h ps_interface.h pset_callbacks.h \
! pset_interface.h run.h run_callbacks.h run_interface.h
# Evil, but it works...
! CPPFLAGS +=-I../.. -D_VERSION_=\"0.7\" $(PY_CFLAGS) $(GTK_CFLAGS)
$(SDL_CFLAGS)
SWIGFLAGS = -D_DLGEDIT_ -D_DEBUG_
! dlgedit_LDADD = ../../libadonthell.a \
! $(SDL_LIBS) $(PY_LIBS) $(GTK_LIBS)
lex.loadlg.cc: loadlg.l
--- 7,80 ----
SUBDIRS = examples
! # EXTRA_DIST = loadlg.l ins_dlgedit_modules.py py_character.i py_quest.i
character.py quest.py
! dlgedit_SOURCES = \
! dlg_arrow.cc \
! dlg_circle.cc \
! dlg_circle_entry.cc \
! dlg_compiler.cc \
! dlg_module.cc \
! dlg_module_entry.cc \
! dlg_mover.cc \
! dlg_node.cc \
! dlg_point.cc \
! dlg_rect.cc \
! gui_circle.cc \
! gui_circle_events.cc \
! gui_code.cc \
! gui_dlgedit.cc \
! gui_dlgedit_events.cc \
! gui_edit.cc \
! gui_error.cc \
! gui_file.cc \
! gui_graph.cc \
! gui_graph_events.cc \
! gui_list.cc \
! gui_list_events.cc \
! gui_messages.cc \
! gui_modal_dialog.cc \
! gui_settings.cc \
! gui_tooltip.cc \
! lex.loadlg.cc \
! main.cc \
! dlg_arrow.h \
! dlg_circle.h \
! dlg_circle_entry.h \
! dlg_compiler.h \
! dlg_module.h \
! dlg_module_entry.h \
! dlg_mover.h \
! dlg_node.h \
! dlg_node_gfx.h \
! dlg_point.h \
! dlg_rect.h \
! dlg_types.h \
! gui_circle.h \
! gui_circle_events.h \
! gui_code.h \
! gui_dlgedit.h \
! gui_dlgedit_events.h \
! gui_edit.h \
! gui_error.h \
! gui_file.h \
! gui_graph.h \
! gui_graph_events.h \
! gui_list.h \
! gui_list_events.h \
! gui_messages.h \
! gui_modal_dialog.h \
! gui_settings.h \
! gui_tooltip.h
# Evil, but it works...
! CPPFLAGS +=-I../.. -D_VERSION_=\"0.8pre1\" $(PY_CFLAGS) $(GTK_CFLAGS)
$(SDL_CFLAGS)
SWIGFLAGS = -D_DLGEDIT_ -D_DEBUG_
! # dlgedit_LDADD = ../../libadonthell.a \
! # $(SDL_LIBS) $(PY_LIBS) $(GTK_LIBS)
!
! dlgedit_LDADD = $(GTK_LIBS) ../../libadonthell.a
! #dlgedit_LDFLAGS = -Wl,-E
lex.loadlg.cc: loadlg.l
Index: lex.loadlg.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/lex.loadlg.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** lex.loadlg.cc 20 Oct 2000 21:06:47 -0000 1.12
--- lex.loadlg.cc 7 Apr 2002 09:51:28 -0000 1.13
***************
*** 304,320 ****
yy_c_buf_p = yy_cp;
! #define YY_NUM_RULES 26
! #define YY_END_OF_BUFFER 27
! static yyconst short int yy_accept[87] =
{ 0,
! 0, 0, 0, 0, 27, 25, 24, 24, 1, 25,
! 23, 25, 25, 25, 25, 25, 25, 25, 25, 25,
! 25, 25, 20, 22, 21, 24, 1, 1, 23, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 0, 0, 0, 0, 0, 0, 22, 15, 0,
! 0, 0, 4, 0, 0, 0, 16, 0, 0, 0,
! 9, 0, 0, 0, 0, 0, 0, 0, 12, 14,
! 0, 8, 17, 7, 10, 6, 18, 11, 5, 13,
! 3, 0, 0, 2, 19, 0
} ;
--- 304,322 ----
yy_c_buf_p = yy_cp;
! #define YY_NUM_RULES 29
! #define YY_END_OF_BUFFER 30
! static yyconst short int yy_accept[97] =
{ 0,
! 0, 0, 0, 0, 30, 28, 27, 27, 1, 28,
! 26, 28, 28, 28, 28, 28, 28, 28, 28, 28,
! 28, 28, 28, 28, 23, 25, 24, 27, 1, 1,
! 26, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
! 0, 25, 0, 0, 0, 0, 0, 4, 0, 0,
! 20, 0, 15, 0, 0, 0, 9, 0, 0, 0,
! 0, 0, 0, 0, 0, 12, 22, 21, 14, 0,
! 8, 16, 7, 10, 6, 19, 17, 11, 5, 13,
! 3, 0, 0, 2, 18, 0
!
} ;
***************
*** 327,342 ****
1, 1, 1, 1, 5, 1, 1, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 1, 1, 1,
! 1, 1, 1, 1, 7, 1, 8, 1, 9, 10,
! 11, 1, 1, 1, 1, 12, 1, 13, 1, 14,
! 1, 15, 1, 16, 1, 17, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 18, 1, 19, 20,
!
! 21, 1, 1, 1, 22, 1, 23, 24, 25, 26,
! 27, 28, 1, 29, 30, 31, 32, 33, 34, 35,
! 36, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 37, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
--- 329,344 ----
1, 1, 1, 1, 5, 1, 1, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 1, 1, 1,
! 1, 1, 1, 1, 7, 1, 8, 9, 10, 11,
! 12, 1, 13, 1, 1, 14, 1, 15, 1, 16,
! 1, 17, 1, 18, 1, 19, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 20, 1, 21, 22,
!
! 23, 1, 1, 1, 24, 25, 26, 27, 28, 29,
! 30, 31, 1, 32, 33, 34, 35, 36, 37, 38,
! 39, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 40, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
***************
*** 351,426 ****
} ;
! static yyconst int yy_meta[38] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 2
} ;
! static yyconst short int yy_base[90] =
{ 0,
! 0, 0, 74, 73, 109, 112, 36, 38, 105, 101,
! 100, 23, 21, 79, 72, 82, 80, 32, 18, 83,
! 28, 82, 112, 0, 112, 52, 96, 112, 92, 66,
! 67, 66, 68, 73, 66, 65, 64, 81, 63, 52,
! 55, 55, 63, 64, 47, 53, 51, 0, 112, 52,
! 59, 57, 112, 57, 55, 51, 112, 52, 41, 50,
! 112, 37, 48, 32, 41, 31, 26, 34, 112, 112,
! 36, 112, 112, 112, 112, 112, 112, 112, 112, 112,
! 112, 35, 22, 112, 112, 112, 64, 66, 43
} ;
! static yyconst short int yy_def[90] =
{ 0,
! 86, 1, 87, 87, 86, 86, 86, 86, 88, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 89, 86, 86, 88, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 89, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 0, 86, 86, 86
} ;
! static yyconst short int yy_nxt[150] =
{ 0,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
! 16, 17, 18, 19, 20, 21, 22, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
! 6, 6, 6, 6, 6, 6, 23, 26, 26, 26,
! 26, 30, 32, 48, 42, 38, 43, 33, 45, 39,
! 85, 31, 40, 26, 26, 84, 83, 82, 41, 81,
! 80, 79, 78, 46, 24, 24, 27, 27, 77, 76,
! 75, 74, 73, 72, 71, 70, 69, 68, 67, 66,
! 65, 64, 63, 62, 61, 60, 59, 58, 57, 56,
! 55, 54, 53, 52, 51, 50, 49, 29, 28, 47,
!
! 44, 37, 36, 35, 34, 29, 29, 28, 86, 25,
! 25, 5, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86
} ;
! static yyconst short int yy_chk[150] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 1, 7, 7, 8,
! 8, 12, 13, 89, 19, 18, 19, 13, 21, 18,
! 83, 12, 18, 26, 26, 82, 71, 68, 18, 67,
! 66, 65, 64, 21, 87, 87, 88, 88, 63, 62,
! 60, 59, 58, 56, 55, 54, 52, 51, 50, 47,
46, 45, 44, 43, 42, 41, 40, 39, 38, 37,
- 36, 35, 34, 33, 32, 31, 30, 29, 27, 22,
! 20, 17, 16, 15, 14, 11, 10, 9, 5, 4,
! 3, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
! 86, 86, 86, 86, 86, 86, 86, 86, 86
} ;
--- 353,436 ----
} ;
! static yyconst int yy_meta[41] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 1, 1, 1, 2
} ;
! static yyconst short int yy_base[100] =
{ 0,
! 0, 0, 82, 81, 120, 123, 39, 41, 116, 112,
! 111, 84, 21, 81, 85, 78, 89, 82, 86, 30,
! 17, 89, 25, 88, 123, 0, 123, 54, 104, 123,
! 100, 73, 72, 74, 72, 71, 78, 70, 69, 76,
! 67, 87, 66, 55, 58, 58, 29, 69, 51, 57,
! 55, 0, 56, 64, 62, 51, 50, 123, 60, 58,
! 123, 53, 123, 55, 43, 53, 123, 39, 49, 50,
! 38, 48, 37, 32, 36, 123, 123, 123, 123, 39,
! 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
! 123, 38, 26, 123, 123, 123, 64, 66, 53
!
} ;
! static yyconst short int yy_def[100] =
{ 0,
! 96, 1, 97, 97, 96, 96, 96, 96, 98, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 99, 96, 96, 98, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 99, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 0, 96, 96, 96
!
} ;
! static yyconst short int yy_nxt[164] =
{ 0,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
! 16, 17, 18, 19, 20, 21, 22, 23, 24, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
! 6, 6, 6, 6, 6, 6, 6, 6, 6, 25,
! 28, 28, 28, 28, 33, 42, 46, 49, 47, 43,
! 34, 68, 44, 52, 35, 28, 28, 95, 69, 45,
! 94, 93, 92, 50, 26, 26, 29, 29, 91, 90,
! 89, 88, 87, 86, 85, 84, 83, 82, 81, 80,
! 79, 78, 77, 76, 75, 74, 73, 72, 71, 70,
! 67, 66, 65, 64, 63, 62, 61, 60, 59, 58,
!
! 57, 56, 55, 54, 53, 31, 30, 51, 48, 41,
! 40, 39, 38, 37, 36, 32, 31, 31, 30, 96,
! 27, 27, 5, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96
} ;
! static yyconst short int yy_chk[164] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
! 7, 7, 8, 8, 13, 20, 21, 23, 21, 20,
! 13, 47, 20, 99, 13, 28, 28, 93, 47, 20,
! 92, 80, 75, 23, 97, 97, 98, 98, 74, 73,
! 72, 71, 70, 69, 68, 66, 65, 64, 62, 60,
! 59, 57, 56, 55, 54, 53, 51, 50, 49, 48,
46, 45, 44, 43, 42, 41, 40, 39, 38, 37,
! 36, 35, 34, 33, 32, 31, 29, 24, 22, 19,
! 18, 17, 16, 15, 14, 12, 11, 10, 9, 5,
! 4, 3, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
! 96, 96, 96
} ;
***************
*** 455,459 ****
#include <math.h>
#include <string>
! #include "dlgnode.h"
#define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
--- 465,469 ----
#include <math.h>
#include <string>
! #include "dlg_types.h"
#define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
***************
*** 462,466 ****
#define YY_NO_UNPUT 1
#define YY_NEVER_INTERACTIVE 1
! #line 465 "lex.loadlg.cc"
/* Macros after this point can all be overridden by user definitions in
--- 472,476 ----
#define YY_NO_UNPUT 1
#define YY_NEVER_INTERACTIVE 1
! #line 475 "lex.loadlg.cc"
/* Macros after this point can all be overridden by user definitions in
***************
*** 616,620 ****
! #line 619 "lex.loadlg.cc"
if ( yy_init )
--- 626,630 ----
! #line 629 "lex.loadlg.cc"
if ( yy_init )
***************
*** 667,671 ****
{
yy_current_state = (int)
yy_def[yy_current_state];
! if ( yy_current_state >= 87 )
yy_c = yy_meta[(unsigned int) yy_c];
}
--- 677,681 ----
{
yy_current_state = (int)
yy_def[yy_current_state];
! if ( yy_current_state >= 97 )
yy_c = yy_meta[(unsigned int) yy_c];
}
***************
*** 673,677 ****
++yy_cp;
}
! while ( yy_base[yy_current_state] != 112 );
yy_find_action:
--- 683,687 ----
++yy_cp;
}
! while ( yy_base[yy_current_state] != 123 );
yy_find_action:
***************
*** 772,833 ****
YY_RULE_SETUP
#line 46 "loadlg.l"
! return LOAD_ACT;
YY_BREAK
case 16:
YY_RULE_SETUP
#line 47 "loadlg.l"
! return LOAD_NPC;
YY_BREAK
case 17:
YY_RULE_SETUP
#line 48 "loadlg.l"
! return LOAD_NAME;
YY_BREAK
case 18:
YY_RULE_SETUP
#line 49 "loadlg.l"
! return LOAD_RACE;
YY_BREAK
case 19:
YY_RULE_SETUP
#line 50 "loadlg.l"
! return LOAD_GENDER;
YY_BREAK
case 20:
YY_RULE_SETUP
! #line 52 "loadlg.l"
! mytext = ""; BEGIN(text);
YY_BREAK
case 21:
YY_RULE_SETUP
! #line 53 "loadlg.l"
! BEGIN(INITIAL); return LOAD_STR;
YY_BREAK
case 22:
YY_RULE_SETUP
! #line 54 "loadlg.l"
! mytext += yytext;
YY_BREAK
case 23:
YY_RULE_SETUP
! #line 56 "loadlg.l"
! mynum = atoi (yytext); return LOAD_NUM;
YY_BREAK
case 24:
YY_RULE_SETUP
! #line 58 "loadlg.l"
! ;
YY_BREAK
case 25:
YY_RULE_SETUP
#line 59 "loadlg.l"
return LOAD_UNKNOWN;
YY_BREAK
! case 26:
YY_RULE_SETUP
! #line 60 "loadlg.l"
ECHO;
YY_BREAK
! #line 832 "lex.loadlg.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(text):
--- 782,858 ----
YY_RULE_SETUP
#line 46 "loadlg.l"
! return LOAD_NPC;
YY_BREAK
case 16:
YY_RULE_SETUP
#line 47 "loadlg.l"
! return LOAD_NAME;
YY_BREAK
case 17:
YY_RULE_SETUP
#line 48 "loadlg.l"
! return LOAD_RACE;
YY_BREAK
case 18:
YY_RULE_SETUP
#line 49 "loadlg.l"
! return LOAD_GENDER;
YY_BREAK
case 19:
YY_RULE_SETUP
#line 50 "loadlg.l"
! return LOAD_PROJECT;
YY_BREAK
case 20:
YY_RULE_SETUP
! #line 51 "loadlg.l"
! return LOAD_IMPORTS;
YY_BREAK
case 21:
YY_RULE_SETUP
! #line 52 "loadlg.l"
! return LOAD_DTOR;
YY_BREAK
case 22:
YY_RULE_SETUP
! #line 53 "loadlg.l"
! return LOAD_CTOR;
YY_BREAK
case 23:
YY_RULE_SETUP
! #line 55 "loadlg.l"
! mytext = ""; BEGIN(text);
YY_BREAK
case 24:
YY_RULE_SETUP
! #line 56 "loadlg.l"
! BEGIN(INITIAL); return LOAD_STR;
YY_BREAK
case 25:
YY_RULE_SETUP
+ #line 57 "loadlg.l"
+ mytext += yytext;
+ YY_BREAK
+ case 26:
+ YY_RULE_SETUP
#line 59 "loadlg.l"
+ mynum = atoi (yytext); return LOAD_NUM;
+ YY_BREAK
+ case 27:
+ YY_RULE_SETUP
+ #line 61 "loadlg.l"
+ ;
+ YY_BREAK
+ case 28:
+ YY_RULE_SETUP
+ #line 62 "loadlg.l"
return LOAD_UNKNOWN;
YY_BREAK
! case 29:
YY_RULE_SETUP
! #line 63 "loadlg.l"
ECHO;
YY_BREAK
! #line 857 "lex.loadlg.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(text):
***************
*** 1122,1126 ****
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 87 )
yy_c = yy_meta[(unsigned int) yy_c];
}
--- 1147,1151 ----
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 97 )
yy_c = yy_meta[(unsigned int) yy_c];
}
***************
*** 1157,1165 ****
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 87 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int)
yy_c];
! yy_is_jam = (yy_current_state == 86);
return yy_is_jam ? 0 : yy_current_state;
--- 1182,1190 ----
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 97 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int)
yy_c];
! yy_is_jam = (yy_current_state == 96);
return yy_is_jam ? 0 : yy_current_state;
***************
*** 1396,1400 ****
#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
! extern int isatty YY_PROTO(( int ));
#endif
#endif
--- 1421,1425 ----
#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
! #include<unistd.h>
#endif
#endif
***************
*** 1716,1718 ****
}
#endif
! #line 60 "loadlg.l"
--- 1741,1743 ----
}
#endif
! #line 63 "loadlg.l"
Index: loadlg.l
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/loadlg.l,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** loadlg.l 20 Oct 2000 21:06:47 -0000 1.9
--- loadlg.l 7 Apr 2002 09:51:28 -0000 1.10
***************
*** 16,20 ****
#include <math.h>
#include <string>
! #include "dlgnode.h"
#define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
--- 16,20 ----
#include <math.h>
#include <string>
! #include "dlg_types.h"
#define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
***************
*** 44,56 ****
Vars return LOAD_VARS;
Func return LOAD_FUNC;
- Act return LOAD_ACT;
NPC return LOAD_NPC;
Name return LOAD_NAME;
Race return LOAD_RACE;
Gender return LOAD_GENDER;
!
! § mytext = ""; BEGIN(text);
! <text>§ BEGIN(INITIAL); return LOAD_STR;
! <text>[^§]+ mytext += yytext;
{num} mynum = atoi (yytext); return LOAD_NUM;
--- 44,59 ----
Vars return LOAD_VARS;
Func return LOAD_FUNC;
NPC return LOAD_NPC;
Name return LOAD_NAME;
Race return LOAD_RACE;
Gender return LOAD_GENDER;
! Proj return LOAD_PROJECT;
! Inc return LOAD_IMPORTS;
! Dtor return LOAD_DTOR;
! Ctor return LOAD_CTOR;
!
! § mytext = ""; BEGIN(text);
! <text>§ BEGIN(INITIAL); return LOAD_STR;
! <text>[^§]+ mytext += yytext;
{num} mynum = atoi (yytext); return LOAD_NUM;
Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/main.cc,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** main.cc 29 Sep 2001 14:17:26 -0000 1.52
--- main.cc 7 Apr 2002 09:51:28 -0000 1.53
***************
*** 2,6 ****
$Id$
! Copyright (C) 1999/2000/2001 Kai Sterker <address@hidden>
Part of the Adonthell Project http://adonthell.linuxgames.com
--- 2,6 ----
$Id$
! Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
Part of the Adonthell Project http://adonthell.linuxgames.com
***************
*** 13,16 ****
--- 13,78 ----
*/
+ /**
+ * @file main.cc
+ *
+ * @author Kai Sterker
+ * @brief The main function of dlgedit.
+ */
+
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+
+ #include <gtk/gtk.h>
+ #include <locale.h>
+ #include <getopt.h>
+ #include "gettext.h"
+ #include "game.h"
+ #include "gui_dlgedit.h"
+ /*
+ int parse_arguments (int argc, char *argv[])
+ {
+ int c;
+
+ while ((c = getopt (argc, argv, "c:")) != -1)
+ {
+ switch (c)
+ {
+ case 'c':
+ {
+
+ break;
+ }
+ }
+ }
+
+ return optind;
+ }
+ */
+ int main (int argc, char *argv[])
+ {
+ // Init GTK+
+ gtk_init (&argc, &argv);
+
+ // Init i18n
+ setlocale (LC_ALL, "");
+
+ // init game directory
+ game::init (DATA_DIR"/games");
+
+ // Create the User Interface
+ GuiDlgedit dlgedit;
+
+ // Create a new dialogue
+ dlgedit.newDialogue ();
+
+ // Start the main loop
+ gtk_main ();
+
+ // good bye
+ return 0;
+ }
+
+ /*
class dialog;
***************
*** 230,234 ****
}
! /* Set variables to safe values */
void
init_app (MainFrame * MainWnd)
--- 292,296 ----
}
! // Set variables to safe values
void
init_app (MainFrame * MainWnd)
***************
*** 258,262 ****
}
! /* free allocated memory */
void
delete_dialogue (MainFrame * wnd)
--- 320,324 ----
}
! // free allocated memory
void
delete_dialogue (MainFrame * wnd)
***************
*** 264,268 ****
u_int32 i;
! /* Delete all nodes */
for (i = 0; i < wnd->number; i++)
delete wnd->nodes[i];
--- 326,330 ----
u_int32 i;
! // Delete all nodes
for (i = 0; i < wnd->number; i++)
delete wnd->nodes[i];
***************
*** 273,275 ****
if (wnd->tooltip) gtk_widget_destroy (wnd->tooltip);
}
!
--- 335,337 ----
if (wnd->tooltip) gtk_widget_destroy (wnd->tooltip);
}
! */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src/tools/dlgedit dialogue.py,1.1,1.2 dlg_arrow.cc,1.1,1.2 dlg_arrow.h,1.1,1.2 dlg_circle.cc,1.1,1.2 dlg_circle.h,1.1,1.2 dlg_circle_entry.cc,1.1,1.2 dlg_circle_entry.h,1.1,1.2 dlg_compiler.cc,1.1,1.2 dlg_compiler.h,1.1,1.2 dlg_module.cc,1.1,1.2 dlg_module.h,1.1,1.2 dlg_module_entry.cc,1.1,1.2 dlg_module_entry.h,1.1,1.2 dlg_mover.cc,1.1,1.2 dlg_mover.h,1.1,1.2 dlg_node.cc,1.1,1.2 dlg_node.h,1.1,1.2 dlg_node_gfx.h,1.1,1.2 dlg_point.cc,1.1,1.2 dlg_point.h,1.1,1.2 dlg_rect.cc,1.1,1.2 dlg_rect.h,1.1,1.2 dlg_types.h,1.1,1.2 gui_circle.cc,1.1,1.2 gui_circle.h,1.1,1.2 gui_circle_events.cc,1.1,1.2 gui_circle_events.h,1.1,1.2 gui_code.cc,1.1,1.2 gui_code.h,1.1,1.2 gui_dlgedit.cc,1.1,1.2 gui_dlgedit.h,1.1,1.2 gui_dlgedit_events.cc,1.1,1.2 gui_dlgedit_events.h,1.1,1.2 gui_edit.cc,1.1,1.2 gui_edit.h,1.1,1.2 gui_error.cc,1.1,1.2 gui_error.h,1.1,1.2 gui_file.cc,1.1,1.2 gui_file.h,1.1,1.2 gui_graph.cc,1.1,1.2 gui_graph.h,1.1,1.2 gui_graph_events.cc,1.1,1.2 gui_graph_events.h,1.1,1.2 gui_list.cc,1.1,1.2 gui_list.h,1.1,1.2 gui_list_events.cc,1.1,1.2 gui_list_events.h,1.1,1.2 gui_messages.cc,1.1,1.2 gui_messages.h,1.1,1.2 gui_modal_dialog.cc,1.1,1.2 gui_modal_dialog.h,1.1,1.2 gui_settings.cc,1.1,1.2 gui_settings.h,1.1,1.2 gui_tooltip.cc,1.1,1.2 gui_tooltip.h,1.1,1.2 Makefile.am,1.41,1.42 lex.loadlg.cc,1.12,1.13 loadlg.l,1.9,1.10 main.cc,1.52,1.53,
Kai Sterker <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: adonthell/doc/devel newmap.dxt,1.3,1.4 reference.cfg,1.3,1.4
- Next by Date:
[Adonthell-commits] CVS: adonthell/src gettext.h,1.1,1.2 game.cc,1.24,1.25 game.h,1.22,1.23 main.cc,1.39,1.40 prefs.cc,1.10,1.11 python_class.cc,1.5,1.6 python_class.h,1.6,1.7
- Previous by thread:
[Adonthell-commits] CVS: adonthell/doc/devel newmap.dxt,1.3,1.4 reference.cfg,1.3,1.4
- Next by thread:
[Adonthell-commits] CVS: adonthell/src gettext.h,1.1,1.2 game.cc,1.24,1.25 game.h,1.22,1.23 main.cc,1.39,1.40 prefs.cc,1.10,1.11 python_class.cc,1.5,1.6 python_class.h,1.6,1.7
- Index(es):