Author Topic: Antipodes 6(b r6559 & d r6576)(10/06/10)  (Read 6064 times)

0 Members and 1 Guest are viewing this topic.

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Antipodes 6(b r6559 & d r6576)(10/06/10)
These (like the r6533 builds) should be identical in many respect to Trunk, just stronger, better, faster.

A quick repost for some useful files, in case you don't already have them, if you do, nothing has changed:
In relation to the shaders, there are replacement files for Blur and PostProcessing:
(to be placed in data\effects)
Ant_6-Shaders.7z
MD5: 3A2D4C6D77E941FA7E7F57D5CEBA4850

Because there are changes to the handling of POF data and cache generation, the following VP (in 7z format) is being provided with the new cache files for the models released in the 3.6.12 MediaVPs.
3612_Ant-Cache.7z
MD5: C5E8CDBE1A49354DFF160F9467129BB9

Windows Builds
FSO_Win-Antipodes_6b_SSE-r6559.7z
MD5: 6A0337D5541C8002FB371ED98DDF941C

FSO_Win-Antipodes_6b_SSE2-r6559.7z
MD5: D38558FCC8DCD33CB64A6ED1228EABCD

Mac Builds
FS2_Open-Inferno_Ant6b_r6559.zip
MD5: 273117eab013d518ac653d0cfb2d146b

Linux Builds
go here


/code/ Warnings Resolution Builds - Updated: 10/06/2010
Fixed the issue regarding sexp_show_subtitle_text and sexp_show_subtitle_image

_ANY_ problem with these 'd' builds should be checked for:
1: Is it reproducible in the build?
2: Does it also happen in the 'b' builds?

If '1' and '2' are a 'yes', check against the latest Nightly. If it also happens there, then we have a general issue (if it is related to sound, post it up in the "Testing, Testing, One, Two ..."  (new sound code) thread)

If '1' is 'yes' and '2' is 'no', post it here AND send me a PM.

Windows Builds
Inferno_SSE
FSO_Win-Antipodes_6d_SSE-r6576.7z
MD5: 43574E114D315EC8D8A386A4646D467B

Inferno SSE2
FSO_Win-Antipodes_6d_SSE2-r6576.7z
MD5: 9A3E072875C250323DD0E9BE827B0927

Warnings Resolution Patch data
(Do a "Save As" vs. direct-click)
Getting this tested on Mac/Linux builds is an absolute before the individual components can go to Trunk. SCP folks can post on Internal, non-SCP folks wanting to provide feedback on how this .patch works on Mac/Unix can either post here or PM me directly.

Some fixes and changes since the r6533 builds are:
Code: [Select]
------------------------------------------------------------------------
r6535 | The_E | 2010-09-29 14:01:04 -0500 (Wed, 29 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp

Removing an Int3() that isn't as impossible to hit as expected. Since we can exit gracefully here, we should.
------------------------------------------------------------------------
r6536 | The_E | 2010-09-29 19:00:49 -0500 (Wed, 29 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/gamesnd/eventmusic.h

Bumping MAX_SPOOLED_MUSIC to 50.
------------------------------------------------------------------------
r6537 | Zacam | 2010-09-30 00:50:04 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/cmdline/cmdline.cpp
   M /trunk/fs2_open/code/cmdline/cmdline.h
   D /trunk/fs2_open/code/decals
   M /trunk/fs2_open/code/freespace2/freespace.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/model/modelinterp.cpp
   M /trunk/fs2_open/code/object/collideshipweapon.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp
   M /trunk/fs2_open/projects/MSVC_2005/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters
   M /trunk/fs2_open/projects/MSVC_6/code.dsp
   M /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj
   M /trunk/fs2_open/projects/codeblocks/code/code.cbp

Purging of the Decal system. Includes Projects updates for codeblocks, MSVC 6-2010 and Xcode.
------------------------------------------------------------------------
r6539 | The_E | 2010-09-30 12:22:58 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/cmdline/cmdline.cpp

Fix for Mantis 2289 (Invalid commandline arguments passed to FRED)
------------------------------------------------------------------------
r6540 | The_E | 2010-09-30 19:38:58 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/object/object.cpp
   M /trunk/fs2_open/code/object/object.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/physics/physics.cpp
   M /trunk/fs2_open/code/physics/physics.h
   M /trunk/fs2_open/code/playerman/playercontrol.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   A /trunk/fs2_open/code/sound/grammar.h

Adding the "force-glide" sexp by request of Axem
------------------------------------------------------------------------
r6541 | The_E | 2010-09-30 20:36:44 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/object/object.cpp

Fix compilation warning
------------------------------------------------------------------------
r6542 | The_E | 2010-09-30 22:06:09 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Another compilation warning fix.
------------------------------------------------------------------------
r6543 | Zacam | 2010-09-30 23:10:03 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound
   D /trunk/fs2_open/code/sound/grammar.h

Removed "grammar.h" and added to 'ignore' list. Also added phrases.cfg to 'ignore' list.
------------------------------------------------------------------------
r6545 | Sushi | 2010-09-30 23:20:40 -0500 (Thu, 30 Sep 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/object/collideshipship.cpp

Get rid of compiler warnings
------------------------------------------------------------------------
r6547 | The_E | 2010-10-01 02:53:03 -0500 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Adding a sanity check here.
------------------------------------------------------------------------
r6548 | taylor | 2010-10-01 09:42:03 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/Makefile.am

remove decal files
------------------------------------------------------------------------
r6549 | taylor | 2010-10-01 09:42:04 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/ds.cpp

only need half size for mono buffer memory
------------------------------------------------------------------------
r6550 | taylor | 2010-10-01 09:42:05 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/sound.cpp

easier to follow debug messages for sound loading
------------------------------------------------------------------------
r6551 | taylor | 2010-10-01 09:42:06 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/sound.cpp

allow duplicate when same file exists as both 2D and 3D in sounds.tbl
------------------------------------------------------------------------
r6552 | The_E | 2010-10-01 11:12:31 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/weapon/weapons.cpp

Readding parsing for decals so we don't break stuff unnecessarily.
------------------------------------------------------------------------
r6553 | taylor | 2010-10-01 11:53:50 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /branches/antipodes/code/graphics/gropenglpostprocessing.cpp

fix bloom issue when clipping is enabled (death scene, cutscene, etc.)
------------------------------------------------------------------------
r6554 | The_E | 2010-10-01 12:09:17 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/weapon/weapons.cpp

Adding a deprecation warning to the log
------------------------------------------------------------------------
r6555 | The_E | 2010-10-01 12:14:24 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Print warning here as well.
------------------------------------------------------------------------
r6556 | The_E | 2010-10-01 15:27:37 -0800 (Fri, 01 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/sound/audiostr.cpp
   M /trunk/fs2_open/code/sound/audiostr.h

Adding the ad.stopMusic() function to scripting
------------------------------------------------------------------------
r6558 | Echelon9 | 2010-10-02 00:06:17 -0800 (Sat, 02 Oct 2010) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Correction to r6555 to use mprintf correctly
------------------------------------------------------------------------
« Last Edit: October 06, 2010, 06:07:28 pm by Zacam »
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline FUBAR-BDHR

  • Self-Propelled Trouble Magnet
  • 212
  • Master Drunk
    • 165th Beer Drinking Hell Raisers
Re: Antipodes 6(b and c) (r6559)(10/02/10)
Debug logs from Linux saved and linked by request:

http://Ant6c debug build log
http://Antc release build log

[03:46] Zacam: Fubar: Note that they came from "C" (or, Antipodes 6 + Warnings Resolution) please.
« Last Edit: October 03, 2010, 02:49:11 am by FUBAR-BDHR »
No-one ever listens to Zathras. Quite mad, they say. It is good that Zathras does not mind. He's even grown to like it. Oh yes. -Zathras

 

Offline Echelon9

  • Moderator
  • 210
Re: Antipodes 6(b and c) (r6559)(10/02/10)
Debug build log from Mac Xcode 3.2.4 / GCC 4.0 (with Warnings reduction patch).

http://pastie.org/pastes/1196332

 
Re: Antipodes 6(b and c) (r6559)(10/02/10)
Found an issue with the show-subtitle-text SEXP in the c build. When not explicitly set to be vertically centered, the subtitle will be displayed at the top of the screen (the same could happen in the horizontal direction, haven't checked that). It happens in the c build, but not in the b one. Test mission attached.

[attachment deleted by admin]

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Minecraft
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Antipodes 6(b and c) (r6559)(10/02/10)
Mac Ant 6b uploaded and added to first post.
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b and c) (r6559)(10/02/10)
Found an issue with the show-subtitle-text SEXP in the c build. When not explicitly set to be vertically centered, the subtitle will be displayed at the top of the screen (the same could happen in the horizontal direction, haven't checked that). It happens in the c build, but not in the b one. Test mission attached.

Thank you, I'll look into the changes made and see what broke what where.

**Edit: Haven't _run_ the mission just yet, but looking at it and the code for the .patch, I think I now know exactly where I goofed.

***EDIT the Second: Here is what the code should have been:
Code: [Select]
Index: code/parse/sexp.cpp
===================================================================
--- code/parse/sexp.cpp (revision 6572)
+++ code/parse/sexp.cpp (working copy)
@@ -17259,9 +17259,9 @@void sexp_show_subtitle_text(int node)
  gr_init_alphacolor(&new_color, red, green, blue, 255);
 
  // calculate pixel positions
- int x_pos = gr_screen.max_w * (x_pct / 100.0f);
- int y_pos = gr_screen.max_h * (y_pct / 100.0f);
- int width = gr_screen.max_w * (width_pct / 100.0f);
+ int x_pos = (int) (gr_screen.max_w * (x_pct / 100.0f));
+ int y_pos = (int) (gr_screen.max_h * (y_pct / 100.0f));
+ int width = (int) (gr_screen.max_w * (width_pct / 100.0f));
 
  // add the subtitle
  subtitle new_subtitle(x_pos, y_pos, text, NULL, display_time, fade_time, &new_color, fontnum, center_x, center_y, width, 0, post_shaded);
@@ -17377,10 +17377,10 @@void sexp_show_subtitle_image(int node)
  height_pct = 100;
 
  // calculate pixel positions
- int x_pos = gr_screen.max_w * (x_pct / 100.0f);
- int y_pos = gr_screen.max_h * (y_pct / 100.0f);
- int width = gr_screen.max_w * (width_pct / 100.0f);
- int height = gr_screen.max_h * (height_pct / 100.0f);
+ int x_pos = (int)(gr_screen.max_w * (x_pct / 100.0f));
+ int y_pos = (int)(gr_screen.max_h * (y_pct / 100.0f));
+ int width = (int)(gr_screen.max_w * (width_pct / 100.0f));
+ int height = (int)(gr_screen.max_h * (height_pct / 100.0f));
 
  // add the subtitle
  subtitle new_subtitle(x_pos, y_pos, NULL, image, display_time, fade_time, NULL, -1, center_x, center_y, width, height, post_shaded);

**Edit the Third:
Technically, the elements can be made into floats instead. (and the values for RGB can be made ubytes) but by that stretch, the multi_sends should also then be changed, and that would break some compatibility between builds that I'm not ready to do just yet.

So, while I'm not fond (at ALL) of doing this conversion and/or changing the base values to floats and keeping the multi_send as int's (which I also really don't want to do), it's the only way to non-breakingly resolve the warnings in the compiler.

As soon as opportunity presents itself to ref-actor these as part of any other compatibility breaking changes, I'll do so.
« Last Edit: October 06, 2010, 03:19:14 pm by Zacam »
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Fixed 'd' build put into first post along with an updated Warnings Resolution patch for the remaining Warnings not already committed to Trunk.
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline karajorma

  • King Louie - Jungle VIP
  • Administrator
  • 214
    • Karajorma's Freespace FAQ
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
I can add a multi_send_ubyte() function fairly easily I suspect if you want it. The multi_sexp system was designed to be easy to extend. I only coded in the send functions I actually needed cause I knew I could easily add new ones as required.

Breaking the packets is an issue though. I'd suggest we add the relevant changes within a #ifdef PACKET_BREAK section. That way we don't forget about the change and can simply swap over the code next time we do something that does break the packets.

To be honest though I didn't really care about the wastage involved in sending an int for this SEXP as it's called so rarely that the savings are minimal. On the other hand we'd need a lot of casting to use uints cause gr_init_alphacolor() takes 3 ints as arguments.
Karajorma's Freespace FAQ. It's almost like asking me yourself.

[ Diaspora ] - [ Seeds Of Rebellion ] - [ Mind Games ]

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
A concept patch series I like to title as "Cast Iron" would address that, by going through and finding areas where we are wasting casts on items or elements that don't and will never need the space it's being put into.

R, G, B and A for example. Unless we get 96bit color depth, I seriously doubt that any of them need to be INT or SHORT (signed or unsigned) and yet they are functioned as such on a regular basis and that just makes me grit my teeth.  "the writable size is 'x' bytes, but 'y' bytes might be written:" is not a happy thing to read and some of it is due to the prolific casting we do.

I have a multi_send/get_ubyte as well, but until we get something truly packet or pilot breaking where it can go it an part of the lot, I'm not too worried about it. It currently functions as intended and removes a warning from the compiler which is the point for now.
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline karajorma

  • King Louie - Jungle VIP
  • Administrator
  • 214
    • Karajorma's Freespace FAQ
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
If you mean that you already have coded the functions for send/get_ubyte, get a post up with them on the internal and I'll give it a quick once over. I've certainly got no objection to people adding more functions there and I'd definitely love to see more people getting familiar with how the SEXP packet system works because AFAIK only myself and FUBAR have ever written multi-compliant SEXPs using it. 

As for getting rid of silly casts by eliminating the root cause (as I did just today with the alt_types/callsigns), I'm all for that.
« Last Edit: October 07, 2010, 01:34:32 am by karajorma »
Karajorma's Freespace FAQ. It's almost like asking me yourself.

[ Diaspora ] - [ Seeds Of Rebellion ] - [ Mind Games ]

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Minecraft
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Ok then, here's a diff of Antipodes 6 vs trunk, @ 6592.  We could probably go ahead and get this into trunk now and get Antipodes 7 going.  My main concern in this diff is that the bulk of the lines are actually removal of what looks like unneeded stuff in the VS2005 project files.  If that's cool let's go with it then.  I just ran the following to generate the diff:

svn diff svn://svn.icculus.org/fs2open/trunk/fs2_open svn://svn.icculus.org/fs2open/branches/antipodes > ant6.diff

And afterwards removed any changes that had to do with renaming the builds for Antipodes.
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
chief: I'd rather have the code project files "cleanup" happen as something separate of the Antipodes commit. This was the commit to Trunk is only the elements from go_faster and can be examined independently as such.

Other than that, it matches my diff (aside from ordering) but I did have to do an update to include re-enabling some FBO stuff (as gotten from Swifty).
« Last Edit: October 12, 2010, 06:49:33 pm by Zacam »
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Minecraft
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
If you want it separately, don't put it into Antipodes at once :P

There is stuff mixed in that VS2005 project file stuff that is part of antipodes and stuff that isn't, so simply splitting the diffs adds a chance for error.  I had to be careful just removing the build renames.

How is your diff ordered differently?  Did you make it with SVN?  Or just reorder it by hand?

Also, since there's a very repeatable standalone crash I suppose we should wait until that gets fixed, and that gives goober a chance to double check VC6 too.
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Well, the projects file clean up that took place in Antipodes was carried over to Trunk, but then the 2005 got rebuilt in Trunk separately at a later date. (It took place as part of my adding SSE/SSE2 debugs and different Icons based on build type).

Mine was also built by SVN by exporting all of the Antipodes log changes one by one to Trunk (confirmed by exporting both and using WinMerge to diff the two) and then having Tortoise make a patch from Trunk based on that.

The standalone crash (if it's the same one I think it is) may have been due to Standalone not making the cache files, which is a problem, but it may just mean that standalone needs to already have the cache files present. I do agree that confirming and fixing that would be a good necessity as well as verifying VC6 building before we go to Trunk.
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Minecraft
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Can we move out those project file enhancements into trunk now then?  We're not really waiting on those and it would be easier to generate the diffs and require less changes afterwards.
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

 

Offline Zacam

  • Magnificent Bastard
  • Administrator
  • 211
  • I go Sledge-O-Matic on Spammers
    • Minecraft
    • Steam
    • Twitter
    • ModDB Feature
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Sure thing.

**Edit: Done. And to make sure everything lines up, updated .patch for Trunk 6599.

[attachment deleted by admin]
« Last Edit: October 12, 2010, 06:50:28 pm by Zacam »
Report MediaVP issues, now on the MediaVP Mantis! Read all about it Here!
Talk with the FSU on #SCP-FSU Talk with the SCP on #SCP
"If you can keep a level head in all this confusion, you just don't understand the situation"

¤[D+¬>

[08/01 16:53:11] <sigtau> EveningTea: I have decided that I am a 32-bit registerkin.  Pronouns are eax, ebx, ecx, edx.
[08/01 16:53:31] <EveningTea> dhauidahh
[08/01 16:53:32] <EveningTea> sak
[08/01 16:53:40] * EveningTea froths at the mouth
[08/01 16:53:40] <sigtau> i broke him, boys

 

Offline Goober5000

  • HLP Loremaster
  • Administrator
  • 214
    • Goober5000 Productions
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
I've verified Antipodes building on VC6, except for two files in FRED which use the new[] operator.  Which is strange, because FSO builds fine, and I'm fairly sure it uses new[] too.

Code: [Select]
--------------------Configuration: Fred2 - Win32 Release--------------------
Compiling...
FREDView.cpp
safe_strings disabled - this is not good!
Linking...
nafxcw.lib(afxmem.obj) : error LNK2005: "void * __cdecl operator new(unsigned int)" ([email protected]@Z) already defined in AddVariableDlg.obj
nafxcw.lib(afxmem.obj) : error LNK2005: "void __cdecl operator delete(void *)" ([email protected]@Z) already defined in AddVariableDlg.obj
Release/fred2_open_ant-6_r.exe : fatal error LNK1169: one or more multiply defined symbols found
Error executing link.exe.

fred2_open_ant-6_r.exe - 3 error(s), 0 warning(s)
--------------------Configuration: Fred2 - Win32 Debug--------------------
Compiling...
FREDView.cpp
safe_strings disabled - this is not good!
C:\My Documents\Visual Studio Projects\Visual C++\antipodes\code\fred2\FREDView.cpp(1447) : error C2661: 'new[]' : no overloaded function takes 3 parameters
C:\My Documents\Visual Studio Projects\Visual C++\antipodes\code\fred2\FREDView.cpp(2534) : error C2661: 'new[]' : no overloaded function takes 3 parameters
InitialStatus.cpp
safe_strings disabled - this is not good!
C:\My Documents\Visual Studio Projects\Visual C++\antipodes\code\fred2\InitialStatus.cpp(157) : error C2661: 'new[]' : no overloaded function takes 3 parameters
Error executing cl.exe.

fred2_open_ant-6_d.exe - 3 error(s), 0 warning(s)

I will look at this more later.

 

Offline The E

  • He's Ebeneezer Goode
  • Global Moderator
  • 213
  • Nothing personal, just tech support.
    • Steam
    • Twitter
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
The Problem is fsmemory.h, which taylor introduced. Since MFC redefines new, new[], delete and delete[] as well, the linker can't figure out which definition to use. On VS2008 and 2010 we can use the linker option FORCE:MULTIPLE to allow multiple definitions to coexist (See also: http://msdn.microsoft.com/en-us/library/70abkas3.aspx ); Whether or not a similar option exist on older linkers I do not know.
Let there be light
Let there be moon
Let there be stars and let there be you
Let there be monsters and let there be pain
Let us begin to feel again
--Devin Townsend, Genesis

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Minecraft
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
Another diff, this time after we've purged the non-related project differences out of Antipodes and gotten them into trunk.  Same command generated this as before.

Antipodes 6 vs Trunk @ r6607

Again, I had to modify it by hand to remove build name changes, and that was it.  I can't get it to apply cleanly with 'patch' though, so maybe others might have more luck applying it directly to a trunk checkout.

Edit: And one more time updated the patch to reflect that we just merged FORCE:MULTIPLE into trunk for VS2008/10.  This patch now applies cleanly with 'patch -p0 < ant6.diff', and should probably apply via TortoiseSVN as well.  Once we get the standalone crash fix we should be able to generate a final version of this patch to apply to trunk and get Antipodes 6 finalized.

Edit 2: With the last couple of antipodes commits, there shouldn't be any remaining major bugs.  The patch has been updated and is probably ready for trunk commit.
« Last Edit: October 14, 2010, 01:15:46 am by chief1983 »
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

 

Offline Goober5000

  • HLP Loremaster
  • Administrator
  • 214
    • Goober5000 Productions
Re: Antipodes 6(b r6559 & d r6576)(10/06/10)
/FORCE:MULTIPLE works on MSVC6 too, and with that change, I can confirm that Antipodes works for me.