[Planeshift-cvs] CVS: planeshift/www/serverconsole/npcs npc_actions.php,1.27,1.28

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/www/serverconsole/npcs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15252/www/serverconsole/npcs

Modified Files:
	npc_actions.php 
Log Message:
Updated to handle new trait table.


Index: npc_actions.php
===================================================================
RCS file: /cvsroot/planeshift/planeshift/www/serverconsole/npcs/npc_actions.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** npc_actions.php	18 Dec 2004 21:32:02 -0000	1.27
--- npc_actions.php	13 Feb 2005 23:20:27 -0000	1.28
***************
*** 245,249 ****
  	$id = $_GET['npcid'];
  
! 	     $query = "select s.id, s.location, s.mesh, s.material,  s.texture, c.trait_id from traits s, character_traits c where c.trait_id=s.id and character_id=" . $id;
  	$result = mysql_query2($query);
  	$found = 0;
--- 245,249 ----
  	$id = $_GET['npcid'];
  
! 	     $query = "select t.id, t.location, t.mesh, t.material,  t.texture, c.trait_id from traits t, character_traits c where c.trait_id=t.id and character_id=" . $id;
  	$result = mysql_query2($query);
  	$found = 0;
***************
*** 257,261 ****
    	                 <TD>$line[3]</TD>
    	                 <TD>$line[4]</TD>
!   	                 <TD><FORM action=npc_actions.php?operation=edittraits&npcid=$id&subop=del&itemid=$line[0] METHOD=POST><INPUT type=submit name=submit value=Delete></FORM></TD>
    	            </TR>";
  		$found = 1;
--- 257,261 ----
    	                 <TD>$line[3]</TD>
    	                 <TD>$line[4]</TD>
!   	                 <TD><FORM action=index.php?page=npc_actions?operation=edittraits&npcid=$id&subop=del&itemid=$line[0] METHOD=POST><INPUT type=submit name=submit value=Delete></FORM></TD>
    	            </TR>";
  		$found = 1;
***************
*** 269,278 ****
  
  	echo "<FORM action=index.php?page=npc_actions&operation=edittraits&npcid=$id&subop=add METHOD=POST>";
! 	$query = 'select * from traits ';
  	$result = mysql_query2($query);
  
  	echo '<SELECT name=itemid>';
  	while ($line = mysql_fetch_array($result, MYSQL_NUM)){
! 		echo "<OPTION value=$line[0]>name=$line[1], location=$line[5]</OPTION>";
  	}
  	echo '</SELECT>';
--- 269,278 ----
  
  	echo "<FORM action=index.php?page=npc_actions&operation=edittraits&npcid=$id&subop=add METHOD=POST>";
! 	$query = "select t.id,t.name,t.location from traits t, characters c where c.id=$id and c.racegender_id=t.race_id";
  	$result = mysql_query2($query);
  
  	echo '<SELECT name=itemid>';
  	while ($line = mysql_fetch_array($result, MYSQL_NUM)){
! 		echo "<OPTION value=$line[0]>name=$line[1], location=$line[2]</OPTION>";
  	}
  	echo '</SELECT>';