[Adonthell-commits] CVS: adonthell/src Makefile.am,1.80.2.20,1.80.2.21 game.h,1.22.4.2,1.22.4.3

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv26156

Modified Files:
      Tag: Branch_road_to_0-4
        Makefile.am game.h 
Log Message:
FINISHED dlg_compiler
ADDED loading of character and quests
FIXED crash when loading a directory instead of a dialogue source file


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.80.2.20
retrieving revision 1.80.2.21
diff -C2 -r1.80.2.20 -r1.80.2.21
*** Makefile.am 3 Apr 2002 16:11:30 -0000       1.80.2.20
--- Makefile.am 4 Apr 2002 16:07:49 -0000       1.80.2.21
***************
*** 48,53 ****
  #adonthell_SOURCES = main.cc
  
! libbase_a_SOURCES = fileops.cc gametime.cc \
!       types.h fileops.h gametime.h callback.h
  
  libbase_LDADD = $(SDL_LIBS)
--- 48,67 ----
  #adonthell_SOURCES = main.cc
  
! libbase_a_SOURCES = \
!         character_base.cc \
!         fileops.cc \
!       game.cc \
!         gametime.cc \
!         quest.cc \
!         storage.cc \
!         callback.h \
!         character_base.h \
!       fileops.h \
!       game.h \
!         gametime.h \
!         quest.h \
!         storage.h \
!       str_hash.h \
!         types.h 
  
  libbase_LDADD = $(SDL_LIBS)
***************
*** 103,111 ****
  
  libadonthell_a_SOURCES = input.cc \
-       game.cc \
        yarg.cc \
!       input.h \
!       game.h \
!       str_hash.h
  
  alextest_SOURCES = main.cc
--- 117,122 ----
  
  libadonthell_a_SOURCES = input.cc \
        yarg.cc \
!       input.h 
  
  alextest_SOURCES = main.cc

Index: game.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/game.h,v
retrieving revision 1.22.4.2
retrieving revision 1.22.4.3
diff -C2 -r1.22.4.2 -r1.22.4.3
*** game.h      19 Feb 2002 19:40:09 -0000      1.22.4.2
--- game.h      4 Apr 2002 16:07:49 -0000       1.22.4.3
***************
*** 34,38 ****
  #include "types.h"
  
! using namespace std; 
  
  /**
--- 34,38 ----
  #include "types.h"
  
! using std::string; 
  
  /**