aboutsummaryrefslogtreecommitdiffhomepage
path: root/event.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-01-16 12:10:08 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-01-16 12:10:08 -0800
commitfa796d668fb5b254ed9efe937fbb61b49836a1c1 (patch)
tree35ead684dda36cbc202beae846472cf5bb290552 /event.cpp
parente4ee4ec3d1c464beaae1b92165d4fc5e979c1a4e (diff)
Get some basic function signatures right for new instanced parser
Diffstat (limited to 'event.cpp')
-rw-r--r--event.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/event.cpp b/event.cpp
index 40fd410b..b8d1a99b 100644
--- a/event.cpp
+++ b/event.cpp
@@ -174,7 +174,7 @@ static int event_is_blocked( event_t *e )
block_t *block;
event_block_t *eb;
- for( block = current_block; block; block = block->outer )
+ for( block = parser.current_block; block; block = block->outer )
{
for( eb = block->first_event_block; eb; eb=eb->next )
{
@@ -459,10 +459,10 @@ static void event_fire_internal( event_t *event )
*/
proc_push_interactive(0);
prev_status = proc_get_last_status();
- parser_push_block( EVENT );
- current_block->param1.event = event;
+ parser.push_block( EVENT );
+ parser.current_block->param1.event = event;
eval( buffer.c_str(), 0, TOP );
- parser_pop_block();
+ parser.pop_block();
proc_pop_interactive();
proc_set_last_status( prev_status );
}