@@ -31,9 +31,11 @@
/** creates a menu with it's items */
+ (id) menuWithItems: (MenuItem*) item, ... NS_REQUIRES_NIL_TERMINATION;
++ (id) menuWithArray: (NSArray*) items;
/** initializes a menu with it's items */
- (id) initWithItems: (MenuItem*) item vaList: (va_list) args;
+- (id) initWithArray: (NSArray*) items;
/** align items vertically */
-(void) alignItemsVertically;
cocos2d/Menu.h
@@ -26,60 +26,75 @@
@synthesize opacity;
-- (id) init
++(id) menuWithItems: (MenuItem*) item, ...
{
- NSException* myException = [NSException
- exceptionWithName:@"MenuInit"
- reason:@"Use initWithItems instead"
- userInfo:nil];
- @throw myException;
+ va_list args;
+ va_start(args,item);
+
+ id s = [[[self alloc] initWithItems: item vaList:args] autorelease];
+
+ va_end(args);
+ return s;
}
-+(id) menuWithItems: (MenuItem*) item, ...
++(id) menuWithArray: (NSArray*) items
{
- va_list args;
- va_start(args,item);
-
- id s = [[[self alloc] initWithItems: item vaList:args] autorelease];
-
- va_end(args);
- return s;
+ return [[[self alloc] initWithArray: items] autorelease];
+}
+
+- (id)init
+{
+ if( !(self=[super init]) )
+ return nil;
+
+ // menu in the center of the screen
+ CGSize s = [[Director sharedDirector] winSize];
+
+ // XXX: in v0.7, winSize should return the visible size
+ // XXX: so the bar calculation should be done there
+ CGRect r = [[UIApplication sharedApplication] statusBarFrame];
+ if([[Director sharedDirector] landscape])
+ s.height -= r.size.width;
+ else
+ s.height -= r.size.height;
+ position = cpv(s.width/2, s.height/2);
+
+ isTouchEnabled = YES;
+ selectedItem = -1;
+
+ return self;
}
-(id) initWithItems: (MenuItem*) item vaList: (va_list) args
{
- if( !(self=[super init]) )
- return nil;
-
- // menu in the center of the screen
- CGSize s = [[Director sharedDirector] winSize];
-
- // XXX: in v0.7, winSize should return the visible size
- // XXX: so the bar calculation should be done there
- CGRect r = [[UIApplication sharedApplication] statusBarFrame];
- if([[Director sharedDirector] landscape])
- s.height -= r.size.width;
- else
- s.height -= r.size.height;
- position = cpv(s.width/2, s.height/2);
-
- isTouchEnabled = YES;
- selectedItem = -1;
-
- int z=0;
-
- if (item) {
- [self addChild: item z:z];
- MenuItem *i = va_arg(args, MenuItem*);
- while(i) {
- z++;
- [self addChild: i z:z];
- i = va_arg(args, MenuItem*);
- }
- }
-// [self alignItemsVertically];
-
- return self;
+ if( !(self=[self init]) )
+ return nil;
+
+ int z=0;
+
+ [self addChild: item z:z];
+ MenuItem *i = va_arg(args, MenuItem*);
+ while(i) {
+ z++;
+ [self addChild: i z:z];
+ i = va_arg(args, MenuItem*);
+ }
+// [self alignItemsVertically];
+
+ return self;
+}
+-(id) initWithArray: (NSArray*) items
+{
+ if( !(self=[self init]) )
+ return nil;
+
+ int z=0;
+
+ for(MenuItem* item in items) {
+ [self addChild: item z:++z];
+ }
+
+ return self;
}
-(void) dealloc
cocos2d/Menu.m
6103341ddb683b5be98f529dd1507185e6d7dbbb
Scott Fleckenstein
nullstyle@gmail.com
http://github.com/nullstyle/cocos2d-iphone/commit/ed8079e4ab543bfec051dba8759b18cd0d002ebd
ed8079e4ab543bfec051dba8759b18cd0d002ebd
2009-03-29T20:19:59-07:00
2009-03-29T20:19:59-07:00
Add array support to menu
165b576f302aeb937bba6ac84727e0bae15655f9
Scott Fleckenstein
nullstyle@gmail.com