[ViewVC] Diff of: cvs/deliantra/server/common/loader.C

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.156 by root, Sun Apr 18 12:37:07 2010 UTC vs.
Revision 1.157 by root, Thu Apr 29 12:24:03 2010 UTC

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

…		…
736	case KW_invisible: f.get (invisible); break;	736	case KW_invisible: f.get (invisible); break;
737	case KW_magic: f.get (magic); break;	737	case KW_magic: f.get (magic); break;
738	case KW_state: f.get (state); break;	738	case KW_state: f.get (state); break;
739	case KW_move_slow_penalty: f.get (move_slow_penalty); break;	739	case KW_move_slow_penalty: f.get (move_slow_penalty); break;
740	case KW_material: f.get (materials); break; //TODO: nuke	740	case KW_material: f.get (materials); break; //TODO: nuke
741		741	case KW_materialname: f.get (material); break;
742	case KW_materialname:
743	{
744	shstr sh;
745	f.get (sh);
746	material = name_to_material (sh);
747	}
748	break;
749		742
750	/* These are the new values */	743	/* These are the new values */
751	case KW_move_block: set_move (move_block, f); break;	744	case KW_move_block: set_move (move_block, f); break;
752	case KW_move_allow: set_move (move_allow, f); break;	745	case KW_move_allow: set_move (move_allow, f); break;
753	case KW_move_type: set_move (move_type , f); break;	746	case KW_move_type: set_move (move_type , f); break;