[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37498] branches/soc-2011-cucumber/source: Some clean up from the last commit.

[Daniel Stokes]

Revision: 37498
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37498
Author:   kupoman
Date:     2011-06-15 05:13:23 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
Some clean up from the last commit.
The exit key setting affects the Blenderplayer now.

Modified Paths:
--------------
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp

Modified: branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-06-15 04:46:56 UTC (rev 37497)
+++ branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-06-15 05:13:23 UTC (rev 37498)
@@ -11662,9 +11662,8 @@
 			/* Initialize BGE exit key to esc key */
 			Scene *scene;
 			for(scene= main->scene.first; scene; scene= scene->id.next) {
-				printf("Do version: %d\n", scene->gm.exitkey);
 				if (!scene->gm.exitkey)
-					scene->gm.exitkey = 218;
+					scene->gm.exitkey = 218; //218 is the Blender key code for ESC
 			}
 		}
 	}

Modified: branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c	2011-06-15 04:46:56 UTC (rev 37497)
+++ branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c	2011-06-15 05:13:23 UTC (rev 37498)
@@ -1703,12 +1703,6 @@
 	RNA_def_property_ui_text(prop, "Bits", "Displays bit depth of full screen display");
 	RNA_def_property_update(prop, NC_SCENE, NULL);
 
-	//prop= RNA_def_property(srna, "exitkey", PROP_INT, PROP_UNSIGNED);
-	//RNA_def_property_int_sdna(prop, NULL, "exitkey");
-	//RNA_def_property_range(prop, 0, 198);
-	//RNA_def_property_ui_text(prop, "Exit Key", "The key used to exit the game engine");
-	//RNA_def_property_update(prop, NC_SCENE, NULL);
-
 	prop= RNA_def_property(srna, "exit_key", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "exitkey");
 	RNA_def_property_enum_items(prop, event_type_items);

Modified: branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2011-06-15 04:46:56 UTC (rev 37497)
+++ branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2011-06-15 05:13:23 UTC (rev 37498)
@@ -623,7 +623,6 @@
 		
 
 		m_exitkey = ConvertKeyCode(gm->exitkey);
-		printf("%d %d\n", gm->exitkey, m_exitkey);
 #ifdef WITH_PYTHON
 		CValue::SetDeprecationWarnings(nodepwarnings);
 #else