Ignore:
Timestamp:
06/18/10 20:18:57 (9 years ago)
Author:
beliar
Message:

More code-cleanup

  • removed editor/loaders.py - doesn't seem to be used, editor still works
  • Took care of all errors and all warnings that where possible to fix
  • Renamed GameController? to GameSceneController? and GameView? to GameSceneView? - Will be using more controllers and views for different states of the game
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/code-cleanup-and-refactoring/game/scripts/gamemodel.py

    r548 r550  
    2020import sys 
    2121from gamestate import GameState 
    22 from objects import * 
    23 from objects.action import * 
     22from objects import createObject 
     23from objects.action import ChangeMapAction, ExamineBoxAction, OpenBoxAction, \ 
     24                            UnlockBoxAction, LockBoxAction, TalkAction 
    2425import yaml 
    2526 
     
    8283         
    8384        # Remove all currently loaded maps so we can start fresh 
    84         self.view.deleteMaps(); 
     85        self.view.deleteMaps() 
    8586         
    8687        self.game_state = pickle.load(f) 
     
    9899         
    99100        for map_id in self.game_state.objects: 
    100             for (object_id, obj) in self.game_state.objects[map_id].iteritems(): 
     101            for obj in self.game_state.objects[map_id].itervalues(): 
    101102                if obj.trueAttr("NPC") or obj.trueAttr("AnimatedContainer"): 
    102103                    obj.createBehaviour(self.view.active_map.agent_layer) 
Note: See TracChangeset for help on using the changeset viewer.