mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Cleaning out the tree
git-svn-id: https://svn.eduke32.com/eduke32@185 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
5859c681e3
commit
1bab48f5be
21 changed files with 66 additions and 2885 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +0,0 @@
|
||||||
const char _engine_cflags[] = "";
|
|
||||||
const char _engine_libs[] = "";
|
|
||||||
const char _engine_uname[] = "Darwin megumi.fnord 7.9.0 Darwin Kernel Version 7.9.0: Wed Mar 30 20:11:17 PST 2005; root:xnu/xnu-517.12.7.obj~1/RELEASE_PPC Power Macintosh powerpc";
|
|
||||||
const char _engine_compiler[] = "gcc 3.3 ppc-darwin";
|
|
||||||
const char _engine_date[] = __DATE__ " " __TIME__;
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
UNAME=`uname -a`
|
|
||||||
CC="gcc"
|
|
||||||
CCVERSION=`$CC -dumpversion`
|
|
||||||
CCMACHINE=`$CC -dumpmachine`
|
|
||||||
echo "const char _engine_cflags[] = \"$OTHER_CFLAGS\";" > engineinfo.c
|
|
||||||
echo "const char _engine_libs[] = \"$LIBS\";" >> engineinfo.c
|
|
||||||
echo "const char _engine_uname[] = \"$UNAME\";" >> engineinfo.c
|
|
||||||
echo "const char _engine_compiler[] = \"$CC $CCVERSION $CCMACHINE\";" >> engineinfo.c
|
|
||||||
echo "const char _engine_date[] = __DATE__ \" \" __TIME__;" >> engineinfo.c
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
|
|
||||||
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
|
|
||||||
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
|
|
||||||
|
|
||||||
Feel free to customize this file to suit your needs
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
|
|
||||||
@interface SDLMain : NSObject
|
|
||||||
@end
|
|
||||||
|
|
@ -1,179 +0,0 @@
|
||||||
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
|
|
||||||
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
|
|
||||||
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
|
|
||||||
|
|
||||||
Feel free to customize this file to suit your needs
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <SDL/SDL.h>
|
|
||||||
#import "build.osxmain.h"
|
|
||||||
#import <sys/param.h> /* for MAXPATHLEN */
|
|
||||||
#import <unistd.h>
|
|
||||||
|
|
||||||
static int gArgc;
|
|
||||||
static char **gArgv;
|
|
||||||
static BOOL gFinderLaunch;
|
|
||||||
|
|
||||||
/* A helper category for NSString */
|
|
||||||
@interface NSString (ReplaceSubString)
|
|
||||||
- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
|
|
||||||
@end
|
|
||||||
|
|
||||||
@interface SDLApplication : NSApplication
|
|
||||||
@end
|
|
||||||
|
|
||||||
@implementation SDLApplication
|
|
||||||
/* Invoked from the Quit menu item */
|
|
||||||
- (void)terminate:(id)sender
|
|
||||||
{
|
|
||||||
/* Post a SDL_QUIT event */
|
|
||||||
SDL_Event event;
|
|
||||||
event.type = SDL_QUIT;
|
|
||||||
SDL_PushEvent(&event);
|
|
||||||
}
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
/* The main class of the application, the application's delegate */
|
|
||||||
@implementation SDLMain
|
|
||||||
|
|
||||||
/* Set the working directory to the .app's parent directory */
|
|
||||||
- (void) setupWorkingDirectory:(BOOL)shouldChdir
|
|
||||||
{
|
|
||||||
char parentdir[MAXPATHLEN];
|
|
||||||
char *c;
|
|
||||||
|
|
||||||
strncpy ( parentdir, gArgv[0], sizeof(parentdir) );
|
|
||||||
c = (char*) parentdir;
|
|
||||||
|
|
||||||
while (*c != '\0') /* go to end */
|
|
||||||
c++;
|
|
||||||
|
|
||||||
while (*c != '/') /* back up to parent */
|
|
||||||
c--;
|
|
||||||
|
|
||||||
*c++ = '\0'; /* cut off last part (binary name) */
|
|
||||||
|
|
||||||
if (shouldChdir)
|
|
||||||
{
|
|
||||||
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
|
|
||||||
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix menu to contain the real app name instead of "SDL App" */
|
|
||||||
- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
|
|
||||||
{
|
|
||||||
NSRange aRange;
|
|
||||||
NSEnumerator *enumerator;
|
|
||||||
NSMenuItem *menuItem;
|
|
||||||
|
|
||||||
aRange = [[aMenu title] rangeOfString:@"SDL App"];
|
|
||||||
if (aRange.length != 0)
|
|
||||||
[aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]];
|
|
||||||
|
|
||||||
enumerator = [[aMenu itemArray] objectEnumerator];
|
|
||||||
while ((menuItem = [enumerator nextObject]))
|
|
||||||
{
|
|
||||||
aRange = [[menuItem title] rangeOfString:@"SDL App"];
|
|
||||||
if (aRange.length != 0)
|
|
||||||
[menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]];
|
|
||||||
if ([menuItem hasSubmenu])
|
|
||||||
[self fixMenu:[menuItem submenu] withAppName:appName];
|
|
||||||
}
|
|
||||||
[ aMenu sizeToFit ];
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Called when the internal event loop has just started running */
|
|
||||||
- (void) applicationDidFinishLaunching: (NSNotification *) note
|
|
||||||
{
|
|
||||||
int status;
|
|
||||||
|
|
||||||
/* Set the working directory to the .app's parent directory */
|
|
||||||
[self setupWorkingDirectory:gFinderLaunch];
|
|
||||||
|
|
||||||
/* Set the main menu to contain the real app name instead of "SDL App" */
|
|
||||||
//[self fixMenu:[NSApp mainMenu] withAppName:[[NSProcessInfo processInfo] processName]];
|
|
||||||
[self fixMenu:[NSApp mainMenu] withAppName:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]];
|
|
||||||
|
|
||||||
/* Hand off to main application code */
|
|
||||||
status = SDL_main (gArgc, gArgv);
|
|
||||||
|
|
||||||
/* We're done, thank you for playing */
|
|
||||||
exit(status);
|
|
||||||
}
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
@implementation NSString (ReplaceSubString)
|
|
||||||
|
|
||||||
- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
|
|
||||||
{
|
|
||||||
unsigned int bufferSize;
|
|
||||||
unsigned int selfLen = [self length];
|
|
||||||
unsigned int aStringLen = [aString length];
|
|
||||||
unichar *buffer;
|
|
||||||
NSRange localRange;
|
|
||||||
NSString *result;
|
|
||||||
|
|
||||||
bufferSize = selfLen + aStringLen - aRange.length;
|
|
||||||
buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
|
|
||||||
|
|
||||||
/* Get first part into buffer */
|
|
||||||
localRange.location = 0;
|
|
||||||
localRange.length = aRange.location;
|
|
||||||
[self getCharacters:buffer range:localRange];
|
|
||||||
|
|
||||||
/* Get middle part into buffer */
|
|
||||||
localRange.location = 0;
|
|
||||||
localRange.length = aStringLen;
|
|
||||||
[aString getCharacters:(buffer+aRange.location) range:localRange];
|
|
||||||
|
|
||||||
/* Get last part into buffer */
|
|
||||||
localRange.location = aRange.location + aRange.length;
|
|
||||||
localRange.length = selfLen - localRange.location;
|
|
||||||
[self getCharacters:(buffer+aRange.location+aStringLen) range:localRange];
|
|
||||||
|
|
||||||
/* Build output string */
|
|
||||||
result = [NSString stringWithCharacters:buffer length:bufferSize];
|
|
||||||
|
|
||||||
NSDeallocateMemoryPages(buffer, bufferSize);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef main
|
|
||||||
# undef main
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Main entry point to executable - should *not* be SDL_main! */
|
|
||||||
int main (int argc, char **argv)
|
|
||||||
{
|
|
||||||
|
|
||||||
/* Copy the arguments into a global variable */
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* This is passed if we are launched by double-clicking */
|
|
||||||
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
|
|
||||||
gArgc = 1;
|
|
||||||
gFinderLaunch = YES;
|
|
||||||
} else {
|
|
||||||
gArgc = argc;
|
|
||||||
gFinderLaunch = NO;
|
|
||||||
}
|
|
||||||
gArgv = (char**) malloc (sizeof(*gArgv) * (gArgc+1));
|
|
||||||
assert (gArgv != NULL);
|
|
||||||
for (i = 0; i < gArgc; i++)
|
|
||||||
gArgv[i] = argv[i];
|
|
||||||
gArgv[i] = NULL;
|
|
||||||
|
|
||||||
[SDLApplication poseAsClass:[NSApplication class]];
|
|
||||||
NSApplicationMain (argc, argv);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
|
||||||
<string>English</string>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>build</string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>au.id.jonof.build</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
|
||||||
<string>6.0</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>CFBundleSignature</key>
|
|
||||||
<string>????</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1.0</string>
|
|
||||||
<key>NSMainNibFile</key>
|
|
||||||
<string>osxmain</string>
|
|
||||||
<key>NSPrincipalClass</key>
|
|
||||||
<string>NSApplication</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
|
||||||
<string>English</string>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>game</string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>au.id.jonof.kenbuild</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
|
||||||
<string>6.0</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>CFBundleSignature</key>
|
|
||||||
<string>????</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1.0</string>
|
|
||||||
<key>NSMainNibFile</key>
|
|
||||||
<string>osxmain</string>
|
|
||||||
<key>NSPrincipalClass</key>
|
|
||||||
<string>NSApplication</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
|
|
||||||
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
|
|
||||||
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
|
|
||||||
|
|
||||||
Feel free to customize this file to suit your needs
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
|
|
||||||
@interface SDLMain : NSObject
|
|
||||||
@end
|
|
||||||
|
|
@ -1,179 +0,0 @@
|
||||||
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
|
|
||||||
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
|
|
||||||
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
|
|
||||||
|
|
||||||
Feel free to customize this file to suit your needs
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <SDL/SDL.h>
|
|
||||||
#import "game.osxmain.h"
|
|
||||||
#import <sys/param.h> /* for MAXPATHLEN */
|
|
||||||
#import <unistd.h>
|
|
||||||
|
|
||||||
static int gArgc;
|
|
||||||
static char **gArgv;
|
|
||||||
static BOOL gFinderLaunch;
|
|
||||||
|
|
||||||
/* A helper category for NSString */
|
|
||||||
@interface NSString (ReplaceSubString)
|
|
||||||
- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
|
|
||||||
@end
|
|
||||||
|
|
||||||
@interface SDLApplication : NSApplication
|
|
||||||
@end
|
|
||||||
|
|
||||||
@implementation SDLApplication
|
|
||||||
/* Invoked from the Quit menu item */
|
|
||||||
- (void)terminate:(id)sender
|
|
||||||
{
|
|
||||||
/* Post a SDL_QUIT event */
|
|
||||||
SDL_Event event;
|
|
||||||
event.type = SDL_QUIT;
|
|
||||||
SDL_PushEvent(&event);
|
|
||||||
}
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
/* The main class of the application, the application's delegate */
|
|
||||||
@implementation SDLMain
|
|
||||||
|
|
||||||
/* Set the working directory to the .app's parent directory */
|
|
||||||
- (void) setupWorkingDirectory:(BOOL)shouldChdir
|
|
||||||
{
|
|
||||||
char parentdir[MAXPATHLEN];
|
|
||||||
char *c;
|
|
||||||
|
|
||||||
strncpy ( parentdir, gArgv[0], sizeof(parentdir) );
|
|
||||||
c = (char*) parentdir;
|
|
||||||
|
|
||||||
while (*c != '\0') /* go to end */
|
|
||||||
c++;
|
|
||||||
|
|
||||||
while (*c != '/') /* back up to parent */
|
|
||||||
c--;
|
|
||||||
|
|
||||||
*c++ = '\0'; /* cut off last part (binary name) */
|
|
||||||
|
|
||||||
if (shouldChdir)
|
|
||||||
{
|
|
||||||
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
|
|
||||||
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fix menu to contain the real app name instead of "SDL App" */
|
|
||||||
- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
|
|
||||||
{
|
|
||||||
NSRange aRange;
|
|
||||||
NSEnumerator *enumerator;
|
|
||||||
NSMenuItem *menuItem;
|
|
||||||
|
|
||||||
aRange = [[aMenu title] rangeOfString:@"SDL App"];
|
|
||||||
if (aRange.length != 0)
|
|
||||||
[aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]];
|
|
||||||
|
|
||||||
enumerator = [[aMenu itemArray] objectEnumerator];
|
|
||||||
while ((menuItem = [enumerator nextObject]))
|
|
||||||
{
|
|
||||||
aRange = [[menuItem title] rangeOfString:@"SDL App"];
|
|
||||||
if (aRange.length != 0)
|
|
||||||
[menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]];
|
|
||||||
if ([menuItem hasSubmenu])
|
|
||||||
[self fixMenu:[menuItem submenu] withAppName:appName];
|
|
||||||
}
|
|
||||||
[ aMenu sizeToFit ];
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Called when the internal event loop has just started running */
|
|
||||||
- (void) applicationDidFinishLaunching: (NSNotification *) note
|
|
||||||
{
|
|
||||||
int status;
|
|
||||||
|
|
||||||
/* Set the working directory to the .app's parent directory */
|
|
||||||
[self setupWorkingDirectory:gFinderLaunch];
|
|
||||||
|
|
||||||
/* Set the main menu to contain the real app name instead of "SDL App" */
|
|
||||||
//[self fixMenu:[NSApp mainMenu] withAppName:[[NSProcessInfo processInfo] processName]];
|
|
||||||
[self fixMenu:[NSApp mainMenu] withAppName:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]];
|
|
||||||
|
|
||||||
/* Hand off to main application code */
|
|
||||||
status = SDL_main (gArgc, gArgv);
|
|
||||||
|
|
||||||
/* We're done, thank you for playing */
|
|
||||||
exit(status);
|
|
||||||
}
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
@implementation NSString (ReplaceSubString)
|
|
||||||
|
|
||||||
- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
|
|
||||||
{
|
|
||||||
unsigned int bufferSize;
|
|
||||||
unsigned int selfLen = [self length];
|
|
||||||
unsigned int aStringLen = [aString length];
|
|
||||||
unichar *buffer;
|
|
||||||
NSRange localRange;
|
|
||||||
NSString *result;
|
|
||||||
|
|
||||||
bufferSize = selfLen + aStringLen - aRange.length;
|
|
||||||
buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
|
|
||||||
|
|
||||||
/* Get first part into buffer */
|
|
||||||
localRange.location = 0;
|
|
||||||
localRange.length = aRange.location;
|
|
||||||
[self getCharacters:buffer range:localRange];
|
|
||||||
|
|
||||||
/* Get middle part into buffer */
|
|
||||||
localRange.location = 0;
|
|
||||||
localRange.length = aStringLen;
|
|
||||||
[aString getCharacters:(buffer+aRange.location) range:localRange];
|
|
||||||
|
|
||||||
/* Get last part into buffer */
|
|
||||||
localRange.location = aRange.location + aRange.length;
|
|
||||||
localRange.length = selfLen - localRange.location;
|
|
||||||
[self getCharacters:(buffer+aRange.location+aStringLen) range:localRange];
|
|
||||||
|
|
||||||
/* Build output string */
|
|
||||||
result = [NSString stringWithCharacters:buffer length:bufferSize];
|
|
||||||
|
|
||||||
NSDeallocateMemoryPages(buffer, bufferSize);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef main
|
|
||||||
# undef main
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Main entry point to executable - should *not* be SDL_main! */
|
|
||||||
int main (int argc, char **argv)
|
|
||||||
{
|
|
||||||
|
|
||||||
/* Copy the arguments into a global variable */
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* This is passed if we are launched by double-clicking */
|
|
||||||
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
|
|
||||||
gArgc = 1;
|
|
||||||
gFinderLaunch = YES;
|
|
||||||
} else {
|
|
||||||
gArgc = argc;
|
|
||||||
gFinderLaunch = NO;
|
|
||||||
}
|
|
||||||
gArgv = (char**) malloc (sizeof(*gArgv) * (gArgc+1));
|
|
||||||
assert (gArgv != NULL);
|
|
||||||
for (i = 0; i < gArgc; i++)
|
|
||||||
gArgv[i] = argv[i];
|
|
||||||
gArgv[i] = NULL;
|
|
||||||
|
|
||||||
[SDLApplication poseAsClass:[NSApplication class]];
|
|
||||||
NSApplicationMain (argc, argv);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,825 +0,0 @@
|
||||||
// !$*UTF8*$!
|
|
||||||
{
|
|
||||||
archiveVersion = 1;
|
|
||||||
classes = {
|
|
||||||
};
|
|
||||||
objectVersion = 39;
|
|
||||||
objects = {
|
|
||||||
AB2B5CB408E698F600899067 = {
|
|
||||||
fileType = archive.ar;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = libenginez.a;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = AB2B5CB808E6992B00899067;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
AB2B5CB808E6992B00899067 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = AB2B5C9708E6979600899067;
|
|
||||||
remoteInfo = enginez;
|
|
||||||
};
|
|
||||||
AB2B5D3708E69B7D00899067 = {
|
|
||||||
containerPortal = AB3AF9E808DEE39200C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 1;
|
|
||||||
remoteGlobalIDString = AB3AFEC008DF04E300C0AA42;
|
|
||||||
remoteInfo = editor;
|
|
||||||
};
|
|
||||||
AB2B5D3808E69B7D00899067 = {
|
|
||||||
isa = PBXTargetDependency;
|
|
||||||
target = AB3AFEC008DF04E300C0AA42;
|
|
||||||
targetProxy = AB2B5D3708E69B7D00899067;
|
|
||||||
};
|
|
||||||
AB3A002208DF064900C0AA42 = {
|
|
||||||
fileRef = AB3AFABF08DF035400C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3A002408DF064900C0AA42 = {
|
|
||||||
fileRef = AB3AFA6F08DEE50200C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3A002508DF064900C0AA42 = {
|
|
||||||
fileRef = AB3AFA7308DEE53C00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3A002608DF066200C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = archive.ar;
|
|
||||||
name = libeditor.a;
|
|
||||||
path = /Users/jonof/ports/build/osx/engine/build/libeditor.a;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3A002708DF066200C0AA42 = {
|
|
||||||
fileRef = AB3A002608DF066200C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AF9E408DEE39200C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AFA5F08DEE45000C0AA42,
|
|
||||||
ABBC7AA3099344E40064C16C,
|
|
||||||
AB3AF9EE08DEE3A100C0AA42,
|
|
||||||
AB3AF9EC08DEE39A00C0AA42,
|
|
||||||
AB3AFA7908DEFECF00C0AA42,
|
|
||||||
AB3AF9F908DEE3EE00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9E608DEE39200C0AA42 = {
|
|
||||||
buildSettings = {
|
|
||||||
COPY_PHASE_STRIP = NO;
|
|
||||||
GCC_OPTIMIZATION_LEVEL = 0;
|
|
||||||
};
|
|
||||||
isa = PBXBuildStyle;
|
|
||||||
name = Development;
|
|
||||||
};
|
|
||||||
AB3AF9E708DEE39200C0AA42 = {
|
|
||||||
buildSettings = {
|
|
||||||
COPY_PHASE_STRIP = YES;
|
|
||||||
DEPLOYMENT_POSTPROCESSING = YES;
|
|
||||||
GCC_OPTIMIZATION_LEVEL = 2;
|
|
||||||
};
|
|
||||||
isa = PBXBuildStyle;
|
|
||||||
name = Deployment;
|
|
||||||
};
|
|
||||||
AB3AF9E808DEE39200C0AA42 = {
|
|
||||||
buildSettings = {
|
|
||||||
};
|
|
||||||
buildStyles = (
|
|
||||||
AB3AF9E608DEE39200C0AA42,
|
|
||||||
AB3AF9E708DEE39200C0AA42,
|
|
||||||
);
|
|
||||||
hasScannedForEncodings = 0;
|
|
||||||
isa = PBXProject;
|
|
||||||
mainGroup = AB3AF9E408DEE39200C0AA42;
|
|
||||||
productRefGroup = AB3AF9F908DEE3EE00C0AA42;
|
|
||||||
projectDirPath = "";
|
|
||||||
projectReferences = (
|
|
||||||
{
|
|
||||||
ProductGroup = ABBC7AA5099344E60064C16C;
|
|
||||||
ProjectRef = ABBC7AA3099344E40064C16C;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ProductGroup = AB3AFA6208DEE45200C0AA42;
|
|
||||||
ProjectRef = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
},
|
|
||||||
);
|
|
||||||
targets = (
|
|
||||||
AB3AFBF108DF03C900C0AA42,
|
|
||||||
AB3AF9F708DEE3EE00C0AA42,
|
|
||||||
AB3AFEC008DF04E300C0AA42,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
AB3AF9EC08DEE39A00C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AF9ED08DEE39E00C0AA42,
|
|
||||||
AB3AFA7708DEFEC100C0AA42,
|
|
||||||
AB3AF9FB08DEE3EE00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Game;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9ED08DEE39E00C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AFA6D08DEE4D700C0AA42,
|
|
||||||
AB3AF9F108DEE3DA00C0AA42,
|
|
||||||
AB3AF9F208DEE3DA00C0AA42,
|
|
||||||
AB3AF9F308DEE3DA00C0AA42,
|
|
||||||
ABBC7A9A099344CF0064C16C,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Sources;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9EE08DEE3A100C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AF9EF08DEE3AB00C0AA42,
|
|
||||||
AB3AFEC308DF04E300C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Editor;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9EF08DEE3AB00C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AFECC08DF059E00C0AA42,
|
|
||||||
AB3AF9F008DEE3C100C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Sources;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9F008DEE3C100C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.c;
|
|
||||||
name = bstub.c;
|
|
||||||
path = ../../src/bstub.c;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AF9F108DEE3DA00C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.c;
|
|
||||||
name = config.c;
|
|
||||||
path = ../../src/config.c;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AF9F208DEE3DA00C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.c;
|
|
||||||
name = game.c;
|
|
||||||
path = ../../src/game.c;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AF9F308DEE3DA00C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.c;
|
|
||||||
name = sound.c;
|
|
||||||
path = ../../src/sound.c;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AF9F408DEE3EE00C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
AB3AFA7808DEFEC200C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXResourcesBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AF9F508DEE3EE00C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
AB3AFA5C08DEE43500C0AA42,
|
|
||||||
AB3AFA5D08DEE43500C0AA42,
|
|
||||||
AB3AFA6E08DEE4D700C0AA42,
|
|
||||||
ABBC7A9B099344CF0064C16C,
|
|
||||||
);
|
|
||||||
isa = PBXSourcesBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AF9F608DEE3EE00C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
ABBC7B6409934A410064C16C,
|
|
||||||
AB3AFAC008DF035400C0AA42,
|
|
||||||
AB3AFB5708DF037500C0AA42,
|
|
||||||
AB3AFABE08DF030B00C0AA42,
|
|
||||||
AB3AFA7008DEE50200C0AA42,
|
|
||||||
AB3AFA7408DEE53C00C0AA42,
|
|
||||||
ABBC7B6609934A5A0064C16C,
|
|
||||||
);
|
|
||||||
isa = PBXFrameworksBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AF9F708DEE3EE00C0AA42 = {
|
|
||||||
buildPhases = (
|
|
||||||
AB3AF9F408DEE3EE00C0AA42,
|
|
||||||
AB3AF9F508DEE3EE00C0AA42,
|
|
||||||
AB3AF9F608DEE3EE00C0AA42,
|
|
||||||
ABBC7B40099347230064C16C,
|
|
||||||
);
|
|
||||||
buildRules = (
|
|
||||||
);
|
|
||||||
buildSettings = {
|
|
||||||
FRAMEWORK_SEARCH_PATHS = /Users/jonof/ports/jfaud/osx/build;
|
|
||||||
GCC_CHAR_IS_UNSIGNED_CHAR = YES;
|
|
||||||
GCC_ENABLE_CPP_EXCEPTIONS = NO;
|
|
||||||
GCC_ENABLE_CPP_RTTI = NO;
|
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL NOASM RENDERTYPESDL=1";
|
|
||||||
HEADER_SEARCH_PATHS = "/Developer/SDKs/fmodapi3741mac/api/inc ../../include";
|
|
||||||
INFOPLIST_FILE = "game-Info.plist";
|
|
||||||
INSTALL_PATH = "$(USER_APPS_DIR)";
|
|
||||||
LIBRARY_SEARCH_PATHS = "/Developer/SDKs/fmodapi3741mac/api/lib ../engine/build";
|
|
||||||
OTHER_CFLAGS = "";
|
|
||||||
OTHER_LDFLAGS = "";
|
|
||||||
OTHER_REZFLAGS = "";
|
|
||||||
PRODUCT_NAME = game;
|
|
||||||
SECTORDER_FLAGS = "";
|
|
||||||
WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas";
|
|
||||||
};
|
|
||||||
dependencies = (
|
|
||||||
AB3AFAB608DF00A400C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXNativeTarget;
|
|
||||||
name = game;
|
|
||||||
productName = game;
|
|
||||||
productReference = AB3AF9F808DEE3EE00C0AA42;
|
|
||||||
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
|
||||||
<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
|
|
||||||
<plist version=\"1.0\">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
|
||||||
<string>English</string>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>game</string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>com.yourcompany.game</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
|
||||||
<string>6.0</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>CFBundleSignature</key>
|
|
||||||
<string>????</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1.0</string>
|
|
||||||
<key>NSMainNibFile</key>
|
|
||||||
<string>MainMenu</string>
|
|
||||||
<key>NSPrincipalClass</key>
|
|
||||||
<string>NSApplication</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
";
|
|
||||||
productType = "com.apple.product-type.application";
|
|
||||||
};
|
|
||||||
AB3AF9F808DEE3EE00C0AA42 = {
|
|
||||||
explicitFileType = wrapper.application;
|
|
||||||
includeInIndex = 0;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
path = game.app;
|
|
||||||
refType = 3;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
AB3AF9F908DEE3EE00C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AF9F808DEE3EE00C0AA42,
|
|
||||||
AB3AFEC108DF04E300C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Products;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AF9FB08DEE3EE00C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = text.xml;
|
|
||||||
path = "game-Info.plist";
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFA5C08DEE43500C0AA42 = {
|
|
||||||
fileRef = AB3AF9F108DEE3DA00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA5D08DEE43500C0AA42 = {
|
|
||||||
fileRef = AB3AF9F208DEE3DA00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA5F08DEE45000C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = "wrapper.pb-project";
|
|
||||||
name = engine.xcode;
|
|
||||||
path = ../engine/engine.xcode;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFA6208DEE45200C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3AFA6308DEE45200C0AA42,
|
|
||||||
AB3AFA6408DEE45200C0AA42,
|
|
||||||
AB2B5CB408E698F600899067,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Products;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AFA6308DEE45200C0AA42 = {
|
|
||||||
fileType = archive.ar;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = libengine.a;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = AB3AFA6708DEE46200C0AA42;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
AB3AFA6408DEE45200C0AA42 = {
|
|
||||||
fileType = archive.ar;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = libeditor.a;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = AB3AFA6808DEE46200C0AA42;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
AB3AFA6708DEE46200C0AA42 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = AB3AF5F508DEDABE00C0AA42;
|
|
||||||
remoteInfo = engine;
|
|
||||||
};
|
|
||||||
AB3AFA6808DEE46200C0AA42 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = AB3AF9DE08DEE2CF00C0AA42;
|
|
||||||
remoteInfo = editor;
|
|
||||||
};
|
|
||||||
AB3AFA6D08DEE4D700C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.objc;
|
|
||||||
path = game.osxmain.m;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFA6E08DEE4D700C0AA42 = {
|
|
||||||
fileRef = AB3AFA6D08DEE4D700C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA6F08DEE50200C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = OpenGL.framework;
|
|
||||||
path = /System/Library/Frameworks/OpenGL.framework;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3AFA7008DEE50200C0AA42 = {
|
|
||||||
fileRef = AB3AFA6F08DEE50200C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA7308DEE53C00C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = SDL.framework;
|
|
||||||
path = /Library/Frameworks/SDL.framework;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3AFA7408DEE53C00C0AA42 = {
|
|
||||||
fileRef = AB3AFA7308DEE53C00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA7708DEFEC100C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.nib;
|
|
||||||
path = osxmain.nib;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFA7808DEFEC200C0AA42 = {
|
|
||||||
fileRef = AB3AFA7708DEFEC100C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFA7908DEFECF00C0AA42 = {
|
|
||||||
children = (
|
|
||||||
AB3A002608DF066200C0AA42,
|
|
||||||
AB3AFABD08DF030B00C0AA42,
|
|
||||||
ABBC7AD6099345F70064C16C,
|
|
||||||
AB3AFABF08DF035400C0AA42,
|
|
||||||
AB3AFB5608DF037500C0AA42,
|
|
||||||
ABBC7B6509934A5A0064C16C,
|
|
||||||
AB3AFA6F08DEE50200C0AA42,
|
|
||||||
AB3AFA7308DEE53C00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Frameworks;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
AB3AFAB508DF00A400C0AA42 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 1;
|
|
||||||
remoteGlobalIDString = AB3AF5F408DEDABE00C0AA42;
|
|
||||||
remoteInfo = engine;
|
|
||||||
};
|
|
||||||
AB3AFAB608DF00A400C0AA42 = {
|
|
||||||
isa = PBXTargetDependency;
|
|
||||||
name = "engine (from engine.xcode)";
|
|
||||||
targetProxy = AB3AFAB508DF00A400C0AA42;
|
|
||||||
};
|
|
||||||
AB3AFABD08DF030B00C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = archive.ar;
|
|
||||||
name = libengine.a;
|
|
||||||
path = /Users/jonof/ports/build/osx/engine/build/libengine.a;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3AFABE08DF030B00C0AA42 = {
|
|
||||||
fileRef = AB3AFABD08DF030B00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFABF08DF035400C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = AppKit.framework;
|
|
||||||
path = /System/Library/Frameworks/AppKit.framework;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3AFAC008DF035400C0AA42 = {
|
|
||||||
fileRef = AB3AFABF08DF035400C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFB5608DF037500C0AA42 = {
|
|
||||||
comments = "Needed for fmod to link.";
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = Carbon.framework;
|
|
||||||
path = /System/Library/Frameworks/Carbon.framework;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
AB3AFB5708DF037500C0AA42 = {
|
|
||||||
fileRef = AB3AFB5608DF037500C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFBF108DF03C900C0AA42 = {
|
|
||||||
buildPhases = (
|
|
||||||
);
|
|
||||||
buildSettings = {
|
|
||||||
OTHER_CFLAGS = "";
|
|
||||||
OTHER_LDFLAGS = "";
|
|
||||||
OTHER_REZFLAGS = "";
|
|
||||||
PRODUCT_NAME = All;
|
|
||||||
SECTORDER_FLAGS = "";
|
|
||||||
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
|
|
||||||
};
|
|
||||||
dependencies = (
|
|
||||||
AB3AFBF308DF03D200C0AA42,
|
|
||||||
AB2B5D3808E69B7D00899067,
|
|
||||||
);
|
|
||||||
isa = PBXAggregateTarget;
|
|
||||||
name = All;
|
|
||||||
productName = All;
|
|
||||||
};
|
|
||||||
AB3AFBF208DF03D200C0AA42 = {
|
|
||||||
containerPortal = AB3AF9E808DEE39200C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 1;
|
|
||||||
remoteGlobalIDString = AB3AF9F708DEE3EE00C0AA42;
|
|
||||||
remoteInfo = game;
|
|
||||||
};
|
|
||||||
AB3AFBF308DF03D200C0AA42 = {
|
|
||||||
isa = PBXTargetDependency;
|
|
||||||
target = AB3AF9F708DEE3EE00C0AA42;
|
|
||||||
targetProxy = AB3AFBF208DF03D200C0AA42;
|
|
||||||
};
|
|
||||||
AB3AFEBD08DF04E300C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
AB3AFECE08DF05AE00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXResourcesBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AFEBE08DF04E300C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
AB3AFECA08DF058D00C0AA42,
|
|
||||||
AB3AFECD08DF059E00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXSourcesBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AFEBF08DF04E300C0AA42 = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
AB3A002208DF064900C0AA42,
|
|
||||||
AB3A002708DF066200C0AA42,
|
|
||||||
AB3AFECF08DF063D00C0AA42,
|
|
||||||
AB3A002408DF064900C0AA42,
|
|
||||||
AB3A002508DF064900C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXFrameworksBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
AB3AFEC008DF04E300C0AA42 = {
|
|
||||||
buildPhases = (
|
|
||||||
AB3AFEBD08DF04E300C0AA42,
|
|
||||||
AB3AFEBE08DF04E300C0AA42,
|
|
||||||
AB3AFEBF08DF04E300C0AA42,
|
|
||||||
);
|
|
||||||
buildRules = (
|
|
||||||
);
|
|
||||||
buildSettings = {
|
|
||||||
GCC_CHAR_IS_UNSIGNED_CHAR = YES;
|
|
||||||
GCC_ENABLE_CPP_EXCEPTIONS = NO;
|
|
||||||
GCC_ENABLE_CPP_RTTI = NO;
|
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL NOASM USE_A_C RENDERTYPESDL=1";
|
|
||||||
HEADER_SEARCH_PATHS = ../../include;
|
|
||||||
INFOPLIST_FILE = "editor-Info.plist";
|
|
||||||
INSTALL_PATH = "$(USER_APPS_DIR)";
|
|
||||||
LIBRARY_SEARCH_PATHS = ../engine/build;
|
|
||||||
OTHER_CFLAGS = "";
|
|
||||||
OTHER_LDFLAGS = "";
|
|
||||||
OTHER_REZFLAGS = "";
|
|
||||||
PRODUCT_NAME = build;
|
|
||||||
SECTORDER_FLAGS = "";
|
|
||||||
WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas";
|
|
||||||
};
|
|
||||||
dependencies = (
|
|
||||||
AB3AFEC508DF04EB00C0AA42,
|
|
||||||
AB3AFEC708DF04EB00C0AA42,
|
|
||||||
);
|
|
||||||
isa = PBXNativeTarget;
|
|
||||||
name = editor;
|
|
||||||
productName = editor;
|
|
||||||
productReference = AB3AFEC108DF04E300C0AA42;
|
|
||||||
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
|
||||||
<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
|
|
||||||
<plist version=\"1.0\">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
|
||||||
<string>English</string>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>editor</string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>com.yourcompany.editor</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
|
||||||
<string>6.0</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>CFBundleSignature</key>
|
|
||||||
<string>????</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1.0</string>
|
|
||||||
<key>NSMainNibFile</key>
|
|
||||||
<string>MainMenu</string>
|
|
||||||
<key>NSPrincipalClass</key>
|
|
||||||
<string>NSApplication</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
";
|
|
||||||
productType = "com.apple.product-type.application";
|
|
||||||
};
|
|
||||||
AB3AFEC108DF04E300C0AA42 = {
|
|
||||||
explicitFileType = wrapper.application;
|
|
||||||
includeInIndex = 0;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
path = build.app;
|
|
||||||
refType = 3;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
AB3AFEC308DF04E300C0AA42 = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = text.xml;
|
|
||||||
path = "editor-Info.plist";
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFEC408DF04EB00C0AA42 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 1;
|
|
||||||
remoteGlobalIDString = AB3AF5F408DEDABE00C0AA42;
|
|
||||||
remoteInfo = engine;
|
|
||||||
};
|
|
||||||
AB3AFEC508DF04EB00C0AA42 = {
|
|
||||||
isa = PBXTargetDependency;
|
|
||||||
name = "engine (from engine.xcode)";
|
|
||||||
targetProxy = AB3AFEC408DF04EB00C0AA42;
|
|
||||||
};
|
|
||||||
AB3AFEC608DF04EB00C0AA42 = {
|
|
||||||
containerPortal = AB3AFA5F08DEE45000C0AA42;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 1;
|
|
||||||
remoteGlobalIDString = AB3AF9DD08DEE2CF00C0AA42;
|
|
||||||
remoteInfo = editor;
|
|
||||||
};
|
|
||||||
AB3AFEC708DF04EB00C0AA42 = {
|
|
||||||
isa = PBXTargetDependency;
|
|
||||||
name = "editor (from engine.xcode)";
|
|
||||||
targetProxy = AB3AFEC608DF04EB00C0AA42;
|
|
||||||
};
|
|
||||||
AB3AFECA08DF058D00C0AA42 = {
|
|
||||||
fileRef = AB3AF9F008DEE3C100C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFECC08DF059E00C0AA42 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.c.objc;
|
|
||||||
path = build.osxmain.m;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
AB3AFECD08DF059E00C0AA42 = {
|
|
||||||
fileRef = AB3AFECC08DF059E00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFECE08DF05AE00C0AA42 = {
|
|
||||||
fileRef = AB3AFA7708DEFEC100C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
AB3AFECF08DF063D00C0AA42 = {
|
|
||||||
fileRef = AB3AFABD08DF030B00C0AA42;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
ABBC7A9A099344CF0064C16C = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.cpp.cpp;
|
|
||||||
name = jfaud_sound.cpp;
|
|
||||||
path = ../../src/jfaud_sound.cpp;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
ABBC7A9B099344CF0064C16C = {
|
|
||||||
fileRef = ABBC7A9A099344CF0064C16C;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
ABBC7AA3099344E40064C16C = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = "wrapper.pb-project";
|
|
||||||
name = jfaud.xcode;
|
|
||||||
path = ../../../jfaud/osx/jfaud.xcode;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
ABBC7AA5099344E60064C16C = {
|
|
||||||
children = (
|
|
||||||
ABBC7AA6099344E60064C16C,
|
|
||||||
ABBC7AA7099344E60064C16C,
|
|
||||||
ABBC7AA8099344E60064C16C,
|
|
||||||
);
|
|
||||||
isa = PBXGroup;
|
|
||||||
name = Products;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
ABBC7AA6099344E60064C16C = {
|
|
||||||
fileType = wrapper.framework;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = jfaud.framework;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = ABBC7AAA099344F50064C16C;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
ABBC7AA7099344E60064C16C = {
|
|
||||||
fileType = archive.ar;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = libmpadec.a;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = ABBC7AAB099344F50064C16C;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
ABBC7AA8099344E60064C16C = {
|
|
||||||
fileType = wrapper.application;
|
|
||||||
isa = PBXReferenceProxy;
|
|
||||||
path = jfaudtest.app;
|
|
||||||
refType = 3;
|
|
||||||
remoteRef = ABBC7AAC099344F50064C16C;
|
|
||||||
sourceTree = BUILT_PRODUCTS_DIR;
|
|
||||||
};
|
|
||||||
ABBC7AAA099344F50064C16C = {
|
|
||||||
containerPortal = ABBC7AA3099344E40064C16C;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
|
|
||||||
remoteInfo = jfaud;
|
|
||||||
};
|
|
||||||
ABBC7AAB099344F50064C16C = {
|
|
||||||
containerPortal = ABBC7AA3099344E40064C16C;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = ABE7399C095277C50040A74A;
|
|
||||||
remoteInfo = mpadec;
|
|
||||||
};
|
|
||||||
ABBC7AAC099344F50064C16C = {
|
|
||||||
containerPortal = ABBC7AA3099344E40064C16C;
|
|
||||||
isa = PBXContainerItemProxy;
|
|
||||||
proxyType = 2;
|
|
||||||
remoteGlobalIDString = ABE7394E09526A5B0040A74A;
|
|
||||||
remoteInfo = jfaudtest;
|
|
||||||
};
|
|
||||||
ABBC7AD6099345F70064C16C = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = jfaud.framework;
|
|
||||||
path = /Users/jonof/ports/jfaud/osx/build/jfaud.framework;
|
|
||||||
refType = 0;
|
|
||||||
sourceTree = "<absolute>";
|
|
||||||
};
|
|
||||||
ABBC7B40099347230064C16C = {
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
dstPath = "";
|
|
||||||
dstSubfolderSpec = 10;
|
|
||||||
files = (
|
|
||||||
ABBC7B410993474A0064C16C,
|
|
||||||
);
|
|
||||||
isa = PBXCopyFilesBuildPhase;
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
};
|
|
||||||
ABBC7B410993474A0064C16C = {
|
|
||||||
fileRef = ABBC7AD6099345F70064C16C;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
ABBC7B6409934A410064C16C = {
|
|
||||||
fileRef = ABBC7AD6099345F70064C16C;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
ABBC7B6509934A5A0064C16C = {
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = wrapper.framework;
|
|
||||||
name = OpenAL.framework;
|
|
||||||
path = ../../../../../../Library/Frameworks/OpenAL.framework;
|
|
||||||
refType = 2;
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
ABBC7B6609934A5A0064C16C = {
|
|
||||||
fileRef = ABBC7B6509934A5A0064C16C;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
rootObject = AB3AF9E808DEE39200C0AA42;
|
|
||||||
}
|
|
||||||
7
polymer/build/osx/game/osxmain.nib/classes.nib
generated
7
polymer/build/osx/game/osxmain.nib/classes.nib
generated
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
IBClasses = (
|
|
||||||
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
|
|
||||||
{ACTIONS = {}; CLASS = SDLMain; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
|
|
||||||
);
|
|
||||||
IBVersion = 1;
|
|
||||||
}
|
|
||||||
21
polymer/build/osx/game/osxmain.nib/info.nib
generated
21
polymer/build/osx/game/osxmain.nib/info.nib
generated
|
|
@ -1,21 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>IBDocumentLocation</key>
|
|
||||||
<string>52 97 356 240 0 0 1024 746 </string>
|
|
||||||
<key>IBEditorPositions</key>
|
|
||||||
<dict>
|
|
||||||
<key>29</key>
|
|
||||||
<string>196 422 195 44 0 0 1024 746 </string>
|
|
||||||
</dict>
|
|
||||||
<key>IBFramework Version</key>
|
|
||||||
<string>364.0</string>
|
|
||||||
<key>IBOpenObjects</key>
|
|
||||||
<array>
|
|
||||||
<integer>29</integer>
|
|
||||||
</array>
|
|
||||||
<key>IBSystem Version</key>
|
|
||||||
<string>7W98</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
BIN
polymer/build/osx/game/osxmain.nib/objects.nib
generated
BIN
polymer/build/osx/game/osxmain.nib/objects.nib
generated
Binary file not shown.
|
|
@ -529,6 +529,10 @@ void editinput(void)
|
||||||
|
|
||||||
if (mlook == 1)
|
if (mlook == 1)
|
||||||
{
|
{
|
||||||
|
if(klabs(mousx) > klabs(mousy))
|
||||||
|
mousy /= 3;
|
||||||
|
else mousx /= 3;
|
||||||
|
|
||||||
ang += mousx>>1;
|
ang += mousx>>1;
|
||||||
horiz -= (mousy>>2);
|
horiz -= (mousy>>2);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4423,12 +4423,6 @@ void ExtAnalyzeSprites(void)
|
||||||
}
|
}
|
||||||
// else tspr->cstat&=32767;
|
// else tspr->cstat&=32767;
|
||||||
|
|
||||||
#if defined(POLYMOST) && defined(USE_OPENGL)
|
|
||||||
if (bpp > 8 && usemodels && md_tilehasmodel(tspr->picnum)) {
|
|
||||||
tspr->cstat &= ~4;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if(frames!=0)
|
if(frames!=0)
|
||||||
{
|
{
|
||||||
if(frames==10) frames=0;
|
if(frames==10) frames=0;
|
||||||
|
|
@ -4445,6 +4439,13 @@ void ExtAnalyzeSprites(void)
|
||||||
tspr->picnum += 8-k;
|
tspr->picnum += 8-k;
|
||||||
tspr->cstat |= 4; //set x-flipping bit
|
tspr->cstat |= 4; //set x-flipping bit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(POLYMOST) && defined(USE_OPENGL)
|
||||||
|
if (bpp > 8 && usemodels && md_tilehasmodel(tspr->picnum)) {
|
||||||
|
tspr->cstat &= ~4;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if(frames==2) tspr->picnum+=((((4-(totalclock>>5)))&1)*5);
|
if(frames==2) tspr->picnum+=((((4-(totalclock>>5)))&1)*5);
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ int32 UseJoystick = 0, UseMouse = 1;
|
||||||
int32 RunMode;
|
int32 RunMode;
|
||||||
int32 AutoAim; // JBF 20031125
|
int32 AutoAim; // JBF 20031125
|
||||||
int32 ShowOpponentWeapons;
|
int32 ShowOpponentWeapons;
|
||||||
int32 MouseFilter;
|
int32 MouseFilter,MouseBias;
|
||||||
int32 SmoothInput;
|
int32 SmoothInput;
|
||||||
|
|
||||||
// JBF 20031211: Store the input settings because
|
// JBF 20031211: Store the input settings because
|
||||||
|
|
@ -203,6 +203,7 @@ void CONFIG_SetDefaults( void )
|
||||||
FXDevice = 0;
|
FXDevice = 0;
|
||||||
FXVolume = 220;
|
FXVolume = 220;
|
||||||
MixRate = 44100;
|
MixRate = 44100;
|
||||||
|
MouseBias = 0;
|
||||||
MouseFilter = 0;
|
MouseFilter = 0;
|
||||||
MusicDevice = 0;
|
MusicDevice = 0;
|
||||||
MusicToggle = 1;
|
MusicToggle = 1;
|
||||||
|
|
@ -675,6 +676,7 @@ void CONFIG_ReadSetup( void )
|
||||||
SCRIPT_GetNumber( scripthandle, "Controls","MouseAimingFlipped",&ud.mouseflip); // mouse aiming inverted
|
SCRIPT_GetNumber( scripthandle, "Controls","MouseAimingFlipped",&ud.mouseflip); // mouse aiming inverted
|
||||||
SCRIPT_GetNumber( scripthandle, "Controls","MouseAiming",&ud.mouseaiming); // 1=momentary/0=toggle
|
SCRIPT_GetNumber( scripthandle, "Controls","MouseAiming",&ud.mouseaiming); // 1=momentary/0=toggle
|
||||||
ps[0].aim_mode = ud.mouseaiming;
|
ps[0].aim_mode = ud.mouseaiming;
|
||||||
|
SCRIPT_GetNumber( scripthandle, "Controls","MouseBias",&MouseBias);
|
||||||
SCRIPT_GetNumber( scripthandle, "Controls","MouseFilter",&MouseFilter);
|
SCRIPT_GetNumber( scripthandle, "Controls","MouseFilter",&MouseFilter);
|
||||||
SCRIPT_GetNumber( scripthandle, "Controls","SmoothInput",&SmoothInput);
|
SCRIPT_GetNumber( scripthandle, "Controls","SmoothInput",&SmoothInput);
|
||||||
SCRIPT_GetNumber( scripthandle, "Controls","UseJoystick",&UseJoystick);
|
SCRIPT_GetNumber( scripthandle, "Controls","UseJoystick",&UseJoystick);
|
||||||
|
|
@ -717,6 +719,7 @@ void CONFIG_WriteSetup( void )
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","AutoAim",AutoAim,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","AutoAim",AutoAim,false,false);
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","MouseAimingFlipped",ud.mouseflip,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","MouseAimingFlipped",ud.mouseflip,false,false);
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","MouseAiming",ud.mouseaiming,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","MouseAiming",ud.mouseaiming,false,false);
|
||||||
|
SCRIPT_PutNumber( scripthandle, "Controls","MouseBias",MouseBias,false,false);
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","MouseFilter",MouseFilter,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","MouseFilter",MouseFilter,false,false);
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","SmoothInput",SmoothInput,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","SmoothInput",SmoothInput,false,false);
|
||||||
SCRIPT_PutNumber( scripthandle, "Controls","RunKeyBehaviour",ud.runkey_mode,false,false);
|
SCRIPT_PutNumber( scripthandle, "Controls","RunKeyBehaviour",ud.runkey_mode,false,false);
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ extern int32 ReverseStereo;
|
||||||
extern int32 UseJoystick, UseMouse;
|
extern int32 UseJoystick, UseMouse;
|
||||||
extern int32 RunMode;
|
extern int32 RunMode;
|
||||||
extern int32 AutoAim;
|
extern int32 AutoAim;
|
||||||
extern int32 MouseFilter;
|
extern int32 MouseFilter, MouseBias;
|
||||||
extern int32 SmoothInput;
|
extern int32 SmoothInput;
|
||||||
extern int32 ShowOpponentWeapons;
|
extern int32 ShowOpponentWeapons;
|
||||||
extern int32 ScreenMode;
|
extern int32 ScreenMode;
|
||||||
|
|
|
||||||
|
|
@ -5839,38 +5839,38 @@ void loadefs(char *filenam)
|
||||||
fta_quotes[i] = Bcalloc(MAXQUOTELEN,sizeof(char));
|
fta_quotes[i] = Bcalloc(MAXQUOTELEN,sizeof(char));
|
||||||
{
|
{
|
||||||
char *ppdeathstrings[] = {
|
char *ppdeathstrings[] = {
|
||||||
"%^2%s WAS KICKED TO THE CURB BY %s",
|
"%^2%s ^2WAS KICKED TO THE CURB BY %s",
|
||||||
"%^2%s WAS PICKED OFF BY %s",
|
"%^2%s ^2WAS PICKED OFF BY %s",
|
||||||
"%^2%s TOOK %s'S SHOT TO THE FACE",
|
"%^2%s ^2TOOK %s^2'S SHOT TO THE FACE",
|
||||||
"%^2%s DANCED THE CHAINGUN CHA-CHA WITH %s",
|
"%^2%s ^2DANCED THE CHAINGUN CHA-CHA WITH %s",
|
||||||
"%^2%s TRIED TO MAKE A BONG OUT OF %s'S ROCKET",
|
"%^2%s ^2TRIED TO MAKE A BONG OUT OF %s^2'S ROCKET",
|
||||||
"%^2%s EXPLODED. BLAME %s!",
|
"%^2%s ^2EXPLODED. BLAME %s^2!",
|
||||||
"%^2%s BECAME ONE WITH THE GUM ON %s'S SHOE",
|
"%^2%s ^2BECAME ONE WITH THE GUM ON %s^2'S SHOE",
|
||||||
"%^2%s WAS TOO COOL FOR %s",
|
"%^2%s ^2WAS TOO COOL FOR %s",
|
||||||
"%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s",
|
"%^2%s ^2EXPANDED HIS HORIZONS WITH HELP FROM %s",
|
||||||
"%^2%s THINKS %s SHOULD CHECK HIS GLASSES",
|
"%^2%s ^2THINKS %s ^2SHOULD CHECK HIS GLASSES",
|
||||||
|
|
||||||
"%^2%s TOOK %s'S BOOT TO THE HEAD",
|
"%^2%s ^2TOOK %s^2'S BOOT TO THE HEAD",
|
||||||
"%^2%s FELL VICTIM TO %s's MAGIC AUTOAIMING PISTOL",
|
"%^2%s ^2FELL VICTIM TO %s^2's MAGIC AUTOAIMING PISTOL",
|
||||||
"%^2%s WAS CHASED OFF OF %s'S PORCH",
|
"%^2%s ^2WAS CHASED OFF OF %s^2'S PORCH",
|
||||||
"%^2%s COULDN'T DANCE FAST ENOUGH FOR %s",
|
"%^2%s ^2COULDN'T DANCE FAST ENOUGH FOR %s",
|
||||||
"%^2%s TRIED TO OUTRUN %s'S ROCKET",
|
"%^2%s ^2TRIED TO OUTRUN %s^2'S ROCKET",
|
||||||
"%^2%s FINALLY FOUND %s'S HIDDEN WMDS",
|
"%^2%s ^2FINALLY FOUND %s^2'S HIDDEN WMDS",
|
||||||
"%^2%s WAS JUST TRYING TO HELP %s TIE HIS SHOELACES",
|
"%^2%s ^2WAS JUST TRYING TO HELP %s ^2TIE HIS SHOELACES",
|
||||||
"%^2%s's IGLOO WAS WRECKED BY %s",
|
"%^2%s^2's IGLOO WAS WRECKED BY %s",
|
||||||
"%^2%s BECAME A STICKY FILM ON %s'S BOOTS",
|
"%^2%s ^2BECAME A STICKY FILM ON %s^2'S BOOTS",
|
||||||
"%^2%s WISHES %s HAD PRACTICED BEFORE PLAYING",
|
"%^2%s ^2WISHES %s ^2HAD PRACTICED BEFORE PLAYING",
|
||||||
|
|
||||||
"%^2%s WAS WALKED ALL OVER BY %s",
|
"%^2%s ^2WAS WALKED ALL OVER BY %s",
|
||||||
"%^2%s WAS PICKED OFF BY %s",
|
"%^2%s ^2WAS PICKED OFF BY %s",
|
||||||
"%^2%s WENT QUAIL HUNTING WITH VICE PRESIDENT %s",
|
"%^2%s ^2WENT QUAIL HUNTING WITH VICE PRESIDENT %s",
|
||||||
"%^2%s ENDED UP WITH A FEW NEW HOLES FROM %s's CHAINGUN",
|
"%^2%s ^2ENDED UP WITH A FEW NEW HOLES FROM %s^2's CHAINGUN",
|
||||||
"%^2%s WAS TURNED INTO %s BRAND CHUNKY SALSA",
|
"%^2%s ^2WAS TURNED INTO %s^2 BRAND CHUNKY SALSA",
|
||||||
"%^2%s FOUND A PRESENT FROM %s",
|
"%^2%s ^2FOUND A PRESENT FROM %s",
|
||||||
"%^2%s WAS SCATHED BY %s'S SHRINK RAY",
|
"%^2%s ^2WAS SCATHED BY %s^2'S SHRINK RAY",
|
||||||
"%^2%s WENT TO PIECES. %s, HOW COULD YOU?",
|
"%^2%s ^2WENT TO PIECES. %s^2, HOW COULD YOU?",
|
||||||
"%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s",
|
"%^2%s ^2EXPANDED HIS HORIZONS WITH HELP FROM %s",
|
||||||
"%^2%s WANTS TO KNOW WHY %s IS EVEN PLAYING COOP",
|
"%^2%s ^2WANTS TO KNOW WHY %s ^2IS EVEN PLAYING COOP",
|
||||||
};
|
};
|
||||||
|
|
||||||
char *podeathstrings[] = {
|
char *podeathstrings[] = {
|
||||||
|
|
|
||||||
|
|
@ -604,12 +604,12 @@ void CONTROL_ApplyAxis(int32 axis, ControlInfo *info, controldevice device)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (map[axis].analogmap) {
|
switch (map[axis].analogmap) {
|
||||||
case analog_turning: info->dyaw = set[axis].analog; break;
|
case analog_turning: info->dyaw += set[axis].analog; break;
|
||||||
case analog_strafing: info->dx = set[axis].analog; break;
|
case analog_strafing: info->dx += set[axis].analog; break;
|
||||||
case analog_lookingupanddown: info->dpitch = set[axis].analog; break;
|
case analog_lookingupanddown: info->dpitch += set[axis].analog; break;
|
||||||
case analog_elevation: info->dy = set[axis].analog; break;
|
case analog_elevation: info->dy += set[axis].analog; break;
|
||||||
case analog_rolling: info->droll = set[axis].analog; break;
|
case analog_rolling: info->droll += set[axis].analog; break;
|
||||||
case analog_moving: info->dz = set[axis].analog; break;
|
case analog_moving: info->dz += set[axis].analog; break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -458,6 +458,7 @@ struct cvarmappings {
|
||||||
|
|
||||||
{ "cl_messagetime", "cl_messagetime: length of time to display multiplayer chat messages\n", (void*)&ud.msgdisptime, CVAR_INT, 0, 0, 3600 },
|
{ "cl_messagetime", "cl_messagetime: length of time to display multiplayer chat messages\n", (void*)&ud.msgdisptime, CVAR_INT, 0, 0, 3600 },
|
||||||
|
|
||||||
|
{ "cl_mousebias", "cl_mousebias: hacky thing to make the mouse suck\n", (void*)&MouseBias, CVAR_INT, 0, 0, 32 },
|
||||||
{ "cl_mousefilter", "cl_mousefilter: amount of mouse movement to filter out\n", (void*)&MouseFilter, CVAR_INT, 0, 0, 512 },
|
{ "cl_mousefilter", "cl_mousefilter: amount of mouse movement to filter out\n", (void*)&MouseFilter, CVAR_INT, 0, 0, 512 },
|
||||||
|
|
||||||
{ "cl_showcoords", "cl_showcoords: show your position in the game world", (void*)&ud.coords, CVAR_BOOL, 0, 0, 1 },
|
{ "cl_showcoords", "cl_showcoords: show your position in the game world", (void*)&ud.coords, CVAR_BOOL, 0, 0, 1 },
|
||||||
|
|
|
||||||
|
|
@ -2756,6 +2756,13 @@ void getinput(short snum)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(MouseBias)
|
||||||
|
{
|
||||||
|
if(klabs(info.dyaw) > klabs(info.dpitch))
|
||||||
|
info.dpitch /= MouseBias;
|
||||||
|
else info.dyaw /= MouseBias;
|
||||||
|
}
|
||||||
|
|
||||||
tics = totalclock-lastcontroltime;
|
tics = totalclock-lastcontroltime;
|
||||||
lastcontroltime = totalclock;
|
lastcontroltime = totalclock;
|
||||||
|
|
||||||
|
|
@ -2768,10 +2775,10 @@ void getinput(short snum)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(BUTTON(gamefunc_Jump))
|
if(BUTTON(gamefunc_Jump) && p->on_ground)
|
||||||
jump_input = 2;
|
jump_input = 4;
|
||||||
|
|
||||||
loc.bits = (jump_input > 0); //BUTTON(gamefunc_Jump);
|
loc.bits = (jump_input > 0 || BUTTON(gamefunc_Jump)); //BUTTON(gamefunc_Jump);
|
||||||
loc.bits |= BUTTON(gamefunc_Crouch)<<1;
|
loc.bits |= BUTTON(gamefunc_Crouch)<<1;
|
||||||
loc.bits |= BUTTON(gamefunc_Fire)<<2;
|
loc.bits |= BUTTON(gamefunc_Fire)<<2;
|
||||||
loc.bits |= BUTTON(gamefunc_Aim_Up)<<3;
|
loc.bits |= BUTTON(gamefunc_Aim_Up)<<3;
|
||||||
|
|
@ -3523,8 +3530,8 @@ void processinput(short snum)
|
||||||
default: i = 0; break;
|
default: i = 0; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Bstrcpy(name1,strip_color_codes(&ud.user_name[snum][0]));
|
Bstrcpy(name1,&ud.user_name[snum][0]);
|
||||||
Bstrcpy(name2,strip_color_codes(&ud.user_name[p->frag_ps][0]));
|
Bstrcpy(name2,&ud.user_name[p->frag_ps][0]);
|
||||||
|
|
||||||
Bsprintf(tempbuf,fta_quotes[16300+i+(mulscale(krand(), 3, 16)*10)],name1,name2);
|
Bsprintf(tempbuf,fta_quotes[16300+i+(mulscale(krand(), 3, 16)*10)],name1,name2);
|
||||||
if(ScreenWidth >= 800)
|
if(ScreenWidth >= 800)
|
||||||
|
|
@ -3542,7 +3549,7 @@ void processinput(short snum)
|
||||||
i = 1;
|
i = 1;
|
||||||
else i = 0;
|
else i = 0;
|
||||||
|
|
||||||
Bsprintf(tempbuf,fta_quotes[16350+i],strip_color_codes(&ud.user_name[snum][0]));
|
Bsprintf(tempbuf,fta_quotes[16350+i],&ud.user_name[snum][0]);
|
||||||
if(ScreenWidth >= 800)
|
if(ScreenWidth >= 800)
|
||||||
adduserquote(tempbuf);
|
adduserquote(tempbuf);
|
||||||
else OSD_Printf("%s\n",strip_color_codes(tempbuf));
|
else OSD_Printf("%s\n",strip_color_codes(tempbuf));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue