Changeset 246:8dee25fd070d


Ignore:
Timestamp:
04/07/11 17:11:08 (12 years ago)
Author:
Simon Cross <hodgestar@…>
Branch:
default
Phase:
public
Message:

Fix some npc-test and dialogue bugs.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • scripts/npc-test

    r234 r246  
    9090    if len(args) != 1:
    9191        p.error("Must provide an npc json file")
    92     run(args[0], game)
     92    run(args[0], opts.game)
    9393
    9494if __name__ == '__main__':
  • skaapsteker/dialogue.py

    r233 r246  
    3838        state = self.states[self.state]
    3939        next_state = state.event(my_locals)
    40         if next_state.name in self.states:
     40        if next_state is not None and next_state.name in self.states:
    4141            self.states[self.state].leave(my_locals)
    4242            self.state = next_state.name
Note: See TracChangeset for help on using the changeset viewer.