Merge branch 'master' of git@github.com:ksterker/adonthell

ksterker · Sep 2, 2009 · 7092f0c · 7092f0c
2 parents 86d1087 + a673aa1
commit 7092f0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/rpg/CMakeLists.txt b/src/rpg/CMakeLists.txt
@@ -4,6 +4,8 @@ set(adonthell_rpg_SRCS
 	dialog.cc
 	dialog_line.cc
 	equipment.cc
+	faction.cc
+	group.cc
 	inventory.cc
 	item_storage.cc
 	item.cc
@@ -13,26 +15,26 @@ set(adonthell_rpg_SRCS
 	quest_event.cc
 	quest_event_manager.cc
 	slot.cc
-   race.cpp
-   terrain_effects.cpp
+	specie.cc
 )
 
 set(adonthell_rpg_HEADERS
 	character.h
-	inventory.h
-	log_index.h
 	dialog.h
-	item.h
-	quest_event.h
 	dialog_line.h
-	item_storage.h
-	quest_event_manager.h
-	slot.h
 	equipment.h
+	faction.h
+	group.h
+	inventory.h
+	item.h
+	item_storage.h
 	log_entry.h
+	log_index.h
 	quest.h
-   race.h
-   terrain_effects.h
+	quest_event.h
+	quest_event_manager.h
+	slot.h
+	specie.h
 )
 
 

diff --git a/test/smallworld.cc b/test/smallworld.cc
@@ -43,7 +43,6 @@ class world_test : public adonthell::app
         // # -- set character attributes
         chr->set_position (160, 160);
         chr->set_altitude (5);
-        chr->set_speed (1.0);
 
         // # -- set character location in world
         wrld.put_entity (0, *chr);