From e959a6ee3c02127ad8339f94b7d250c0006f7a33 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 12 Sep 2010 11:13:35 +0900 Subject: [PATCH] Add \n to Sys_Printf calls. --- tools/Forge/Bundles/MapEdit/CameraView.m | 19 ++++--- tools/Forge/Bundles/MapEdit/Clipper.m | 2 +- tools/Forge/Bundles/MapEdit/Map.m | 54 ++++++++++---------- tools/Forge/Bundles/MapEdit/Preferences.m | 2 +- tools/Forge/Bundles/MapEdit/Project.m | 2 +- tools/Forge/Bundles/MapEdit/QuakeEd.m | 22 ++++---- tools/Forge/Bundles/MapEdit/TexturePalette.m | 4 +- tools/Forge/Bundles/MapEdit/XYView.m | 22 ++++---- tools/Forge/Bundles/MapEdit/ZView.m | 13 +++-- 9 files changed, 69 insertions(+), 71 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/CameraView.m b/tools/Forge/Bundles/MapEdit/CameraView.m index fdf052088..ef8d3c59d 100644 --- a/tools/Forge/Bundles/MapEdit/CameraView.m +++ b/tools/Forge/Bundles/MapEdit/CameraView.m @@ -80,10 +80,10 @@ initWithFrame: sb_floor_dist = 99999; [map_i makeAllPerform: @selector (feetToFloor)]; if (sb_floor_dist == 99999) { - Sys_Printf ("already on top floor"); + Sys_Printf ("already on top floor\n"); return self; } - Sys_Printf ("up floor"); + Sys_Printf ("up floor\n"); origin[2] += sb_floor_dist; [quakeed_i updateCamera]; return self; @@ -95,10 +95,10 @@ initWithFrame: sb_floor_dist = -99999; [map_i makeAllPerform: @selector (feetToFloor)]; if (sb_floor_dist == -99999) { - Sys_Printf ("already on bottom floor"); + Sys_Printf ("already on bottom floor\n"); return self; } - Sys_Printf ("down floor"); + Sys_Printf ("down floor\n"); origin[2] += sb_floor_dist; [quakeed_i updateCamera]; return self; @@ -125,7 +125,7 @@ homeView [quakeed_i updateAll]; - Sys_Printf ("homed view angle"); + Sys_Printf ("homed view angle\n"); return self; } @@ -561,7 +561,7 @@ modalMoveLoop // vec3_t temp; - Sys_Printf ("moving camera position"); + Sys_Printf ("moving camera position\n"); VectorCopy (origin, originbase); @@ -816,7 +816,7 @@ mouseDown } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click %x\n", flags); NopSound (); return; @@ -844,13 +844,12 @@ rightMouseDown // click = drag camera // if (flags == 0) { - Sys_Printf ("looking"); + Sys_Printf ("looking\n"); [self viewDrag: &pt]; - Sys_Printf ("%s", ""); return; } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click\n"); NopSound (); return; diff --git a/tools/Forge/Bundles/MapEdit/Clipper.m b/tools/Forge/Bundles/MapEdit/Clipper.m index 848e100be..17ea3fb74 100644 --- a/tools/Forge/Bundles/MapEdit/Clipper.m +++ b/tools/Forge/Bundles/MapEdit/Clipper.m @@ -44,7 +44,7 @@ id clipper_i; VectorCopy (pos[2], pos[0]); VectorCopy (temp, pos[2]); } else { - Sys_Printf ("no clipplane"); + Sys_Printf ("no clipplane\n"); NSBeep (); } diff --git a/tools/Forge/Bundles/MapEdit/Map.m b/tools/Forge/Bundles/MapEdit/Map.m index 5b5a9c154..5571ed6c9 100644 --- a/tools/Forge/Bundles/MapEdit/Map.m +++ b/tools/Forge/Bundles/MapEdit/Map.m @@ -298,7 +298,7 @@ fname useRegion:(BOOL) reg FILE *f; int i; - Sys_Printf ("writeMapFile: %s", fname); + Sys_Printf ("writeMapFile: %s\n", fname); f = fopen (fname, "w"); if (!f) @@ -362,19 +362,19 @@ make a target connection from the original entity. oldent =[self currentEntity]; if (oldent ==[self objectAtIndex:0]) { - Sys_Printf ("Must have a non-world entity selected to connect"); + Sys_Printf ("Must have a non-world entity selected to connect\n"); return self; } [self selectRay: p1: p2:YES]; ent =[self currentEntity]; if (ent == oldent) { - Sys_Printf ("Must click on a different entity to connect"); + Sys_Printf ("Must click on a different entity to connect\n"); return self; } if (ent ==[self objectAtIndex:0]) { - Sys_Printf ("Must click on a non-world entity to connect"); + Sys_Printf ("Must click on a non-world entity to connect\n"); return self; } @@ -427,12 +427,12 @@ to intervening world brushes } if (besttime == 99999) { - Sys_Printf ("trace missed"); + Sys_Printf ("trace missed\n"); return self; } if ([bestbrush regioned]) { - Sys_Printf ("WANRING: clicked on regioned brush"); + Sys_Printf ("WANRING: clicked on regioned brush\n"); return self; } @@ -450,10 +450,10 @@ to intervening world brushes } [bestbrush setSelected:YES]; - Sys_Printf ("selected entity %i brush %i face %i", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); + Sys_Printf ("selected entity %i brush %i face %i\n", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); } else { [bestbrush setSelected:NO]; - Sys_Printf ("deselected entity %i brush %i face %i", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); + Sys_Printf ("deselected entity %i brush %i face %i\n", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); } [quakeed_i enableFlushWindow]; @@ -543,14 +543,14 @@ getTextureRay return nil; if (![bestent modifiable]) { - Sys_Printf ("can't modify spawned entities"); + Sys_Printf ("can't modify spawned entities\n"); return self; } td =[bestbrush texturedefForFace:bestface]; [texturepalette_i setTextureDef:td]; - Sys_Printf ("grabbed texturedef and sizes"); + Sys_Printf ("grabbed texturedef and sizes\n"); [bestbrush getMins: mins maxs:maxs]; @@ -596,17 +596,17 @@ setTextureRay } if (besttime == 99999) { - Sys_Printf ("trace missed"); + Sys_Printf ("trace missed\n"); return self; } if (![bestent modifiable]) { - Sys_Printf ("can't modify spawned entities"); + Sys_Printf ("can't modify spawned entities\n"); return self; } if ([bestbrush regioned]) { - Sys_Printf ("WANRING: clicked on regioned brush"); + Sys_Printf ("WANRING: clicked on regioned brush\n"); return self; } @@ -615,10 +615,10 @@ setTextureRay [quakeed_i disableFlushWindow]; if (allsides) { [bestbrush setTexturedef:&td]; - Sys_Printf ("textured entity %i brush %i", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush]); + Sys_Printf ("textured entity %i brush %i\n", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush]); } else { [bestbrush setTexturedef: &td forFace:bestface]; - Sys_Printf ("deselected entity %i brush %i face %i", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); + Sys_Printf ("deselected entity %i brush %i face %i\n", (int)[self indexOfObject: bestent], (int)[bestent indexOfObject:bestbrush], bestface); } [quakeed_i enableFlushWindow]; @@ -659,7 +659,7 @@ OPERATIONS ON SELECTIONS } // if (!total) -// Sys_Printf ("nothing selected"); +// Sys_Printf ("nothing selected\n"); return self; } @@ -742,7 +742,7 @@ sel_identity (void) -transformSelection { if (![currentEntity modifiable]) { - Sys_Printf ("can't modify spawned entities"); + Sys_Printf ("can't modify spawned entities\n"); return self; } // find an origin to apply the transformation to @@ -893,14 +893,14 @@ UI operations o =[self selectedBrush]; if (!o) { - Sys_Printf ("nothing selected"); + Sys_Printf ("nothing selected\n"); return self; } o =[o parent]; c =[o count]; for (i = 0; i < c; i++) [[o objectAtIndex: i] setSelected:YES]; - Sys_Printf ("%i brushes selected", c); + Sys_Printf ("%i brushes selected\n", c); [quakeed_i updateAll]; @@ -910,13 +910,13 @@ UI operations -makeEntity:sender { if (currentEntity !=[self objectAtIndex:0]) { - Sys_Printf ("ERROR: can't makeEntity inside an entity"); + Sys_Printf ("ERROR: can't makeEntity inside an entity\n"); NSBeep (); return self; } if ([self numSelected] == 0) { - Sys_Printf ("ERROR: must have a seed brush to make an entity"); + Sys_Printf ("ERROR: must have a seed brush to make an entity\n"); NSBeep (); return self; } @@ -945,7 +945,7 @@ UI operations id b; if ([self numSelected] != 1) { - Sys_Printf ("must have a single brush selected"); + Sys_Printf ("must have a single brush selected\n"); return self; } @@ -955,7 +955,7 @@ UI operations [self makeUnselectedPerform:selector]; - Sys_Printf ("identified contents"); + Sys_Printf ("identified contents\n"); [quakeed_i updateAll]; return self; @@ -979,7 +979,7 @@ UI operations texturedef_t td; if ([self numSelected] != 1) { - Sys_Printf ("must have a single brush selected"); + Sys_Printf ("must have a single brush selected\n"); return self; } @@ -1006,7 +1006,7 @@ UI operations texturedef_t td; if ([self numSelected] != 1) { - Sys_Printf ("must have a single brush selected"); + Sys_Printf ("must have a single brush selected\n"); return self; } @@ -1037,7 +1037,7 @@ subtractSelection id o, o2; id sellist, sourcelist; - Sys_Printf ("performing brush subtraction..."); + Sys_Printf ("performing brush subtraction...\n"); sourcelist =[[NSMutableArray alloc] init]; sellist =[[NSMutableArray alloc] init]; @@ -1087,7 +1087,7 @@ subtractSelection [o release]; } - Sys_Printf ("subtracted selection"); + Sys_Printf ("subtracted selection\n"); [quakeed_i updateAll]; return self; diff --git a/tools/Forge/Bundles/MapEdit/Preferences.m b/tools/Forge/Bundles/MapEdit/Preferences.m index cba883ae3..d0181286e 100644 --- a/tools/Forge/Bundles/MapEdit/Preferences.m +++ b/tools/Forge/Bundles/MapEdit/Preferences.m @@ -342,7 +342,7 @@ Grab all the current UI state */ -UIChanged:sender { - Sys_Printf ("defaults updated"); + Sys_Printf ("defaults updated\n"); [self setProjectPath:(char *)[startproject_i stringValue]]; [self setBspSoundPath:(char *)[bspSoundField_i stringValue]]; diff --git a/tools/Forge/Bundles/MapEdit/Project.m b/tools/Forge/Bundles/MapEdit/Project.m index 1bca9ea80..d01520ba5 100644 --- a/tools/Forge/Bundles/MapEdit/Project.m +++ b/tools/Forge/Bundles/MapEdit/Project.m @@ -260,7 +260,7 @@ t in:(id) obj int i, c; char *name; - Sys_Printf ("loading %s", wf); + Sys_Printf ("loading %s\n", wf); // set the row in the settings inspector wad browser c =[wadList count]; diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m index 6e90b5568..740339301 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd.m +++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m @@ -388,7 +388,7 @@ App delegate methods //[self doOpen: "/raid/quake/id1_/maps/amlev1.map"]; // DEBUG [map_i newMap]; - Sys_Printf ("ready."); + Sys_Printf ("ready.\n"); //malloc_debug(-1); // DEBUG @@ -416,11 +416,11 @@ App delegate methods b =[map_i selectedBrush]; if (!b) { - Sys_Printf ("nothing selected"); + Sys_Printf ("nothing selected\n"); return self; } td =[b texturedef]; - Sys_Printf (td->texture); + Sys_Printf ("%s\n", td->texture); return self; } else Sys_Printf ("Unknown command\n"); @@ -530,7 +530,7 @@ applyRegion: // get the bounds of the current selection if ([map_i numSelected] != 1) { - Sys_Printf ("must have a single brush selected"); + Sys_Printf ("must have a single brush selected\n"); return self; } @@ -893,23 +893,23 @@ keyDown switch ([theEvent keyCode]) { case 60: // F2 [cameraview_i setDrawMode:dr_wire]; - Sys_Printf ("wire draw mode"); + Sys_Printf ("wire draw mode\n"); return self; case 61: // F3 [cameraview_i setDrawMode:dr_flat]; - Sys_Printf ("flat draw mode"); + Sys_Printf ("flat draw mode\n"); return self; case 62: // F4 [cameraview_i setDrawMode:dr_texture]; - Sys_Printf ("texture draw mode"); + Sys_Printf ("texture draw mode\n"); return self; case 63: // F5 [xyview_i setDrawMode:dr_wire]; - Sys_Printf ("wire draw mode"); + Sys_Printf ("wire draw mode\n"); return self; case 64: // F6 - Sys_Printf ("texture draw mode"); + Sys_Printf ("texture draw mode\n"); return self; case 66: // F8 @@ -970,7 +970,7 @@ keyDown case 13: // enter [clipper_i carve]; [self updateAll]; - Sys_Printf ("carved brush"); + Sys_Printf ("carved brush\n"); break; case ' ': @@ -1021,7 +1021,7 @@ keyDown break; default: - Sys_Printf ("undefined keypress"); + Sys_Printf ("undefined keypress\n"); NopSound (); break; } diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.m b/tools/Forge/Bundles/MapEdit/TexturePalette.m index 245214540..d167c4608 100644 --- a/tools/Forge/Bundles/MapEdit/TexturePalette.m +++ b/tools/Forge/Bundles/MapEdit/TexturePalette.m @@ -230,7 +230,7 @@ TEX_InitFromWad (char *path) stop = Sys_DoubleTime (); - Sys_Printf ("loaded %s (%5.1f)", local, stop - start); + Sys_Printf ("loaded %s (%5.1f)\n", local, stop - start); } /* @@ -422,7 +422,7 @@ TEX_ForName (char *name) (takeCurrentTexture)]; [quakeed_i updateAll]; } else - Sys_Printf ("can't modify spawned entities"); + Sys_Printf ("can't modify spawned entities\n"); } [quakeed_i makeFirstResponder:quakeed_i]; return self; diff --git a/tools/Forge/Bundles/MapEdit/XYView.m b/tools/Forge/Bundles/MapEdit/XYView.m index dce09d16c..f77586144 100644 --- a/tools/Forge/Bundles/MapEdit/XYView.m +++ b/tools/Forge/Bundles/MapEdit/XYView.m @@ -906,7 +906,7 @@ DragCallback (float dx, float dy) -selectionDragFrom:(NSEvent *) theEvent { - Sys_Printf ("dragging selection"); + Sys_Printf ("dragging selection\n"); [self dragFrom: theEvent useGrid: YES callback:DragCallback]; [quakeed_i updateAll]; return self; @@ -937,7 +937,7 @@ ScrollCallback (float dx, float dy) -scrollDragFrom:(NSEvent *) theEvent { - Sys_Printf ("scrolling view"); + Sys_Printf ("scrolling view\n"); [self dragFrom: theEvent useGrid: YES callback:ScrollCallback]; return self; @@ -972,7 +972,7 @@ DirectionCallback (float dx, float dy) { NSPoint pt; - Sys_Printf ("changing camera direction"); + Sys_Printf ("changing camera direction\n"); pt =[theEvent locationInWindow]; pt =[self convertPoint: pt fromView:NULL]; @@ -1021,7 +1021,7 @@ NewCallback (float dx, float dy) texturedef_t td; NSPoint pt; - Sys_Printf ("sizing new brush"); + Sys_Printf ("sizing new brush\n"); pt =[theEvent locationInWindow]; pt =[self convertPoint: pt fromView:NULL]; @@ -1087,7 +1087,7 @@ ControlCallback (float dx, float dy) if (!numcontrolpoints) return NO; - Sys_Printf ("dragging brush plane"); + Sys_Printf ("dragging brush plane\n"); pt =[theEvent locationInWindow]; pt =[self convertPoint: pt fromView:NULL]; @@ -1140,7 +1140,7 @@ ControlCallback (float dx, float dy) if (!numcontrolpoints) return NO; - Sys_Printf ("dragging brush plane"); + Sys_Printf ("dragging brush plane\n"); pt =[theEvent locationInWindow]; pt =[self convertPoint: pt fromView:NULL]; @@ -1207,7 +1207,7 @@ mouseDown if (flags == 0) { // if double click, position Z checker if ([theEvent clickCount] > 1) { - Sys_Printf ("positioned Z checker"); + Sys_Printf ("positioned Z checker\n"); [zview_i setPoint:&pt]; [quakeed_i newinstance]; [quakeed_i updateZ]; @@ -1236,7 +1236,7 @@ mouseDown return[self selectionDragFrom:theEvent]; if ([map_i numSelected]) { - Sys_Printf ("missed"); + Sys_Printf ("missed\n"); return self; } @@ -1260,7 +1260,7 @@ mouseDown [self shearDragFrom:theEvent]; return self; - Sys_Printf ("moving Z checker"); + Sys_Printf ("moving Z checker\n"); [zview_i setXYOrigin:&pt]; [quakeed_i updateAll]; [zview_i XYmouseDown:&pt]; @@ -1293,7 +1293,7 @@ mouseDown return self; } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click %x\n", flags); NopSound (); return self; } @@ -1327,7 +1327,7 @@ rightMouseDown return[self directionDragFrom:theEvent]; } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click\n"); NopSound (); return self; diff --git a/tools/Forge/Bundles/MapEdit/ZView.m b/tools/Forge/Bundles/MapEdit/ZView.m index c0aa3558a..54a907f47 100644 --- a/tools/Forge/Bundles/MapEdit/ZView.m +++ b/tools/Forge/Bundles/MapEdit/ZView.m @@ -587,7 +587,7 @@ ZDragCallback (float dy) -selectionDragFrom:(NSEvent *) theEvent { - Sys_Printf ("dragging selection"); + Sys_Printf ("dragging selection\n"); [self dragFrom: theEvent useGrid: YES callback:ZDragCallback]; [quakeed_i updateCamera]; return self; @@ -617,7 +617,7 @@ ZScrollCallback (float dy) -scrollDragFrom:(NSEvent *) theEvent { - Sys_Printf ("scrolling view"); + Sys_Printf ("scrolling view\n"); [self dragFrom: theEvent useGrid: YES callback:ZScrollCallback]; return self; } @@ -655,7 +655,7 @@ ZControlCallback (float dy) if (!numcontrolpoints) return NO; - Sys_Printf ("dragging brush plane"); + Sys_Printf ("dragging brush plane\n"); pt =[theEvent locationInWindow]; pt =[self convertPoint: pt fromView:NULL]; @@ -721,8 +721,7 @@ mouseDown // if (flags == 0) { // check eye - if ([cameraview_i ZmouseDown: &pt flags:[theEvent - modifierFlags]]) + if ([cameraview_i ZmouseDown: &pt flags:[theEvent modifierFlags]]) return; if ([map_i numSelected]) { @@ -736,7 +735,7 @@ mouseDown } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click %x\n", flags); NopSound (); return; } @@ -766,7 +765,7 @@ rightMouseDown [self scrollDragFrom:theEvent]; } - Sys_Printf ("bad flags for click"); + Sys_Printf ("bad flags for click\n"); NopSound (); }