qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-16 17:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

More cString cleanups.

Browse source 
I don't know that fileSystemRepresentation is any better than cString for
general usage (due to wchar on windows).
This commit is contained in:
Bill Currie 2010-12-28 07:42:08 +09:00
parent d29e8deb0a
commit 7946fec523
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/Forge/Bundles/MapEdit/EntityClass.m
View file

@ -176,6 +176,7 @@ scanFile
{ {
int size, line; int size, line;
const char *data; const char *data;
const char *fname;
id cl; id cl;
int i; int i;
NSString *path; NSString *path;
@ -184,6 +185,7 @@ scanFile
path = [source_path stringByAppendingPathComponent: filename]; path = [source_path stringByAppendingPathComponent: filename];
contents = [fm contentsAtPath: path]; contents = [fm contentsAtPath: path];
fname = [filename fileSystemRepresentation];
if (!contents) if (!contents)
return; return;
@ -195,7 +197,7 @@ scanFile
if (!strncmp (data + i, "/*QUAKED", 8)) { if (!strncmp (data + i, "/*QUAKED", 8)) {
cl = [[EntityClass alloc] cl = [[EntityClass alloc]
initFromText: (data + i) initFromText: (data + i)
source: va ("%s:%d", [filename cString], line)]; source: va ("%s:%d", fname, line)];
if (cl) if (cl)
[self insertEC: cl]; [self insertEC: cl];
} else if (data[i] == '\n') { } else if (data[i] == '\n') {

2
tools/Forge/Bundles/MapEdit/Map.m
View file

@ -254,7 +254,7 @@ readMapFile
dat[size] = 0; dat[size] = 0;
script = Script_New (); script = Script_New ();
Script_Start (script, [fname cString], dat); Script_Start (script, [fname fileSystemRepresentation], dat);
do { do {
new = [[Entity alloc] initFromScript: script]; new = [[Entity alloc] initFromScript: script];

7
tools/Forge/Bundles/MapEdit/QuakeEd.m
View file

@ -695,7 +695,9 @@ saveBSP
[[[mappath lastPathComponent] stringByDeletingPathExtension] [[[mappath lastPathComponent] stringByDeletingPathExtension]
stringByAppendingPathExtension: @"bsp"]]; stringByAppendingPathExtension: @"bsp"]];
ExpandCommand (cmdline, expandedcmd, [mappath cString], [bsppath cString]); ExpandCommand (cmdline, expandedcmd,
[mappath fileSystemRepresentation],
[bsppath fileSystemRepresentation]);
strcat (expandedcmd, " > "); strcat (expandedcmd, " > ");
strcat (expandedcmd, FN_CMDOUT); strcat (expandedcmd, FN_CMDOUT);
@ -828,6 +830,7 @@ save:
- (id) save: sender; - (id) save: sender;
{ {
NSString *backup; NSString *backup;
NSFileManager *fm = [NSFileManager defaultManager];
// force a name change if using tempname // force a name change if using tempname
if (![filename compare: FN_TEMPSAVE]) if (![filename compare: FN_TEMPSAVE])
@ -836,7 +839,7 @@ save:
backup = [[filename stringByDeletingPathExtension] backup = [[filename stringByDeletingPathExtension]
stringByAppendingPathExtension: @"bak"]; stringByAppendingPathExtension: @"bak"];
rename ([filename cString], [backup cString]); // copy old to .bak [fm copyPath: filename toPath: backup handler: nil]; // copy old to .bak
[map_i writeMapFile: filename useRegion: NO]; [map_i writeMapFile: filename useRegion: NO];