[Crystal-cvs] CC-ART r414 - in trunk: data docs

[<cry...@us...>]

Author: jorrit
Date: 2007-07-10 10:46:59 +0200 (Tue, 10 Jul 2007)
New Revision: 414

Modified:
   trunk/data/screenmanager.xml
   trunk/data/startmenu.xml
   trunk/docs/history.txt
Log:
	- Jorrit changed 'activate' and 'deactivate' method names in the
	  screens to the more consistent 'cc_activate' and 'cc_deactivate'.
	- Jorrit renamed the 'menu' entity to 'ent_menu'.



Modified: trunk/data/screenmanager.xml
===================================================================
--- trunk/data/screenmanager.xml	2007-06-29 09:40:39 UTC (rev 413)
+++ trunk/data/screenmanager.xml	2007-07-10 08:46:59 UTC (rev 414)
@@ -24,10 +24,10 @@
 	    -->
 	  <event name="cc_switchscreen">
 	    <if eval="?cc_currentscreen!=''">
-	        <expr eval="('ent_screen_'+?cc_currentscreen)::deactivate()" />
+	        <expr eval="('ent_screen_'+?cc_currentscreen)::cc_deactivate()" />
 	      </if>
 	    <var name="cc_currentscreen" value="@screen" />
-	    <expr eval="('ent_screen_'+?cc_currentscreen)::activate()" />
+	    <expr eval="('ent_screen_'+?cc_currentscreen)::cc_activate()" />
 	  </event>
 	</script>
 
@@ -105,13 +105,13 @@
 	<script name="cc_screen_start">
 	  <superscript name="cc_screen" />
 
-	  <event name="activate">
+	  <event name="cc_activate">
 	    <action propclass="pc(ent_gamemanager,pcworld.zonemanager)" id="actid(ActivateRegion)">
 	      <par id="parid(region)" value="gamecontrol_outgame" />
 	    </action>
 	  </event>
 
-	  <event name="deactivate">
+	  <event name="cc_deactivate">
 	  </event>
 	</script>
 
@@ -121,14 +121,14 @@
 	<script name="cc_screen_test">
 	  <superscript name="cc_screen" />
 
-	  <event name="activate">
+	  <event name="cc_activate">
 	    <lvar name="dir" value="config('CrystalCore.TestLevel','')" />
 	    <lvar name="start" value="config('CrystalCore.TestLevelStart','')" />
 	    <lvar name="region" value="config('CrystalCore.TestLevelStartRegion','')" />
 	    <expr eval="startgame(dir=#dir,start=#start,region=#region)" />
 	  </event>
 
-	  <event name="deactivate">
+	  <event name="cc_deactivate">
 	    <destroyentity name="ent_level" />
 	    <!-- <destroyentity name="ent_player" /> -->
 	  </event>
@@ -140,14 +140,14 @@
 	<script name="cc_screen_hallway">
 	  <superscript name="cc_screen" />
 
-	  <event name="activate">
+	  <event name="cc_activate">
 	    <lvar name="dir" value="config('CrystalCore.DefaultLevel','')" />
 	    <lvar name="start" value="config('CrystalCore.DefaultLevelStartHallway','')" />
 	    <lvar name="region" value="config('CrystalCore.DefaultLevelStartHallwayRegion','')" />
 	    <expr eval="startgame(dir=#dir,start=#start,region=#region)" />
 	  </event>
 
-	  <event name="deactivate">
+	  <event name="cc_deactivate">
 	    <destroyentity name="ent_level" />
 	    <!-- <destroyentity name="ent_player" /> -->
 	  </event>
@@ -159,14 +159,14 @@
 	<script name="cc_screen_station">
 	  <superscript name="cc_screen" />
 
-	  <event name="activate">
+	  <event name="cc_activate">
 	    <lvar name="dir" value="config('CrystalCore.DefaultLevel','')" />
 	    <lvar name="start" value="config('CrystalCore.DefaultLevelStartStation','')" />
 	    <lvar name="region" value="config('CrystalCore.DefaultLevelStartStationRegion','')" />
 	    <expr eval="startgame(dir=#dir,start=#start,region=#region)" />
 	  </event>
 
-	  <event name="deactivate">
+	  <event name="cc_deactivate">
 	    <destroyentity name="ent_level" />
 	    <!-- <destroyentity name="ent_player" /> -->
 	  </event>

Modified: trunk/data/startmenu.xml
===================================================================
--- trunk/data/startmenu.xml	2007-06-29 09:40:39 UTC (rev 413)
+++ trunk/data/startmenu.xml	2007-07-10 08:46:59 UTC (rev 414)
@@ -123,7 +123,7 @@
 		    <expr eval="(?container)::selectmenu(item=ent())" />
 		</event>
 	        <event name="pcbillboard_select">
-		    <if eval="?menu.ccslide"> <sound_restart source="?menu.ccslide" /> </if>
+		    <if eval="?ent_menu.ccslide"> <sound_restart source="?ent_menu.ccslide" /> </if>
 		    <expr eval="(?container)::closemenu(event=?event)" />
 		</event>
 	    </script>
@@ -336,8 +336,8 @@
 		    <default propclass="pc(pc2d.billboard)" />
 		    <property id="propid(materialnamefast)" value="hitbutton_def" />
 		    <!--
-		    <if eval="?menu.cc_uivol>0.01">
-		      <sound name="slideout" loop="false" volume="?menu.cc_uivol" />
+		    <if eval="?ent_menu.cc_uivol>0.01">
+		      <sound name="slideout" loop="false" volume="?ent_menu.cc_uivol" />
 		    </if>
 		    -->
 		    <var name="curoption" value="?curoption+1" />
@@ -496,8 +496,8 @@
 		    <!-- If we have a cc_start event then we show a 'loading' message -->
 		    <if eval="strsub(@event,0,8)=='cc_start'">
 		        <createentity name="loading" behaviour="menu_loading" />
-			<expr eval="ent_musicmanager::cc_fadeoutsound(song=?menu.ccintro,vol=?menu.cc_uivol)" />
-			<expr eval="ent_musicmanager::cc_fadeoutsound(song=?menu.ccslide,vol=?menu.cc_uivol)" />
+			<expr eval="ent_musicmanager::cc_fadeoutsound(song=?ent_menu.ccintro,vol=?ent_menu.cc_uivol)" />
+			<expr eval="ent_musicmanager::cc_fadeoutsound(song=?ent_menu.ccslide,vol=?ent_menu.cc_uivol)" />
 		    </if>
 		    <!-- The timer in this entity will catch the exit_event and then
 		         handle this -->
@@ -859,7 +859,7 @@
 	    </script>
 
 	</addon>
-    	<addon plugin="cel.addons.celentity" entityname="menu" >
+    	<addon plugin="cel.addons.celentity" entityname="ent_menu" >
 	    <behaviour name="menu" />
 	</addon>
     </sector>

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2007-06-29 09:40:39 UTC (rev 413)
+++ trunk/docs/history.txt	2007-07-10 08:46:59 UTC (rev 414)
@@ -3,6 +3,10 @@
 
 The history order is reversed so that new features are at the top.
 
+10-Jul-2007
+	- Jorrit changed 'activate' and 'deactivate' method names in the
+	  screens to the more consistent 'cc_activate' and 'cc_deactivate'.
+	- Jorrit renamed the 'menu' entity to 'ent_menu'.
 29-Jun-2007
 	- Jorrit made a few fixes to the hallway level. Removed redundant
 	  polygons that crossed into other sectors and fixed transparency