View Issue Details

IDProjectCategoryView StatusLast Update
0002777FSSCPBuild systempublic2013-01-13 09:13
Reporteronlyjob Assigned To 
PrioritylowSeveritytweakReproducibilityhave not tried
Status resolvedResolutionfixed 
Platformx86_64OSDebianOS Version7
Product Version3.6.14 
Summary0002777: spelling corrections [patch]
Descriptioncorrect grammar with patch.
TagsNo tags attached.

Activities

onlyjob

2013-01-10 05:30

reporter  

spelling.patch (24,187 bytes)   

Eli2

2013-01-10 20:08

developer   ~0014625

Last edited: 2013-01-10 20:08

the change to ship.cpp will break Ships.tbl, see

http://www.hard-light.net/wiki/index.php/Ships.tbl#.22dont_collide_invisible.22

chief1983

2013-01-10 20:34

administrator   ~0014627

Yeah, that last one cannot go in. In fact I don't even know if any flag like that could support having an apostrophe. Rest of the patch looked fine though.

Goober5000

2013-01-12 22:06

administrator   ~0014639

Looks good to me too. I went to commit the patch, sans the ship.cpp change, but almost every patch hunk was rejected. Onlyjob, could you generate a new patch?

chief1983

2013-01-12 23:58

administrator   ~0014643

Against the latest trunk, please.

onlyjob

2013-01-13 08:17

reporter  

spelling[trunk].patch (26,295 bytes)   

onlyjob

2013-01-13 08:19

reporter   ~0014647

Apologies for messing up with ship.cpp. I'll be more careful.

Please find revised patch for trunk attached. I hope it's better. Thanks.

Goober5000

2013-01-13 09:11

administrator   ~0014648

It's not ship.cpp that's the problem, it's the fact that "dont collide invisible" is actually a flag that is parsed from a file. Don't worry; overall it's a good patch.

Unfortunately, this one was rejected again. I think I see why; you seem to have two separate folder structures under "a" and "b". Fortunately, by editing in Notepad, I was able to convert it so that it patched successfully.

Related Changesets

fs2open: trunk r9503

2013-01-13 04:50

Goober5000


Ported: N/A

Details Diff
onlyjob's spelling fixes, per Mantis 0002777 Affected Issues
0002777
mod - /trunk/fs2_open/code/ai/aiturret.cpp Diff File
mod - /trunk/fs2_open/code/autopilot/autopilot.cpp Diff File
mod - /trunk/fs2_open/code/autopilot/autopilot.h Diff File
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/fs2netd/fs2netd_client.cpp Diff File
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtarget.cpp Diff File
mod - /trunk/fs2_open/code/localization/localize.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionscreencommon.cpp Diff File
mod - /trunk/fs2_open/code/network/multimsgs.cpp Diff File
mod - /trunk/fs2_open/code/network/psnet2.cpp Diff File
mod - /trunk/fs2_open/code/object/objectsnd.cpp Diff File
mod - /trunk/fs2_open/code/parse/lua.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File
mod - /trunk/fs2_open/code/sound/ds.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File
mod - /trunk/fs2_open/lua/lstate.h Diff File

Issue History

Date Modified Username Field Change
2013-01-10 05:30 onlyjob New Issue
2013-01-10 05:30 onlyjob Status new => assigned
2013-01-10 05:30 onlyjob Assigned To => chief1983
2013-01-10 05:30 onlyjob File Added: spelling.patch
2013-01-10 20:08 Eli2 Note Added: 0014625
2013-01-10 20:08 Eli2 Note Edited: 0014625
2013-01-10 20:34 chief1983 Note Added: 0014627
2013-01-10 20:50 niffiwan Status assigned => code review
2013-01-12 22:06 Goober5000 Note Added: 0014639
2013-01-12 23:58 chief1983 Note Added: 0014643
2013-01-13 08:17 onlyjob File Added: spelling[trunk].patch
2013-01-13 08:19 onlyjob Note Added: 0014647
2013-01-13 09:11 Goober5000 Note Added: 0014648
2013-01-13 09:13 Goober5000 Changeset attached => fs2open trunk r9503
2013-01-13 09:13 Goober5000 Assigned To chief1983 =>
2013-01-13 09:13 Goober5000 Status code review => resolved
2013-01-13 09:13 Goober5000 Resolution open => fixed