Mechanized Assault & eXploration Reloaded



#1 Sep 02, 2008 8:16 am
shaktazuki Offline
Mitglied
Registered since: Apr 30, 2008
Posts: 123


Subject: Patches
Here are some patches I've created. If there's a different way you want me to submit, please tell me. My hours on IRC don't appear to coincide with yours.

Thanks!



Attachments:
File Type Information for: zip  patches.zip
Downloads: 218
Filesize: 11.83 KB

↑  ↓

#2 Sep 02, 2008 11:21 am
Eiko Eiko Offline
Moderator, Developer
Registered since: Aug 03, 2007
Posts: 604


Subject: Re: Patches
Thanks for the patches.

I checked in the update for the lang file.

why did interplay rename all the wav files?!? They did it with the music files, too. There they used .msc. anyway...

A few remarks about the resinstaller patch:
- Duplicating all the wav related functions is not the best way to go. Generally duplicating code should be avoided. you could use a string to store the wave file extension. Set the string to .wav or .spw, depending on the tests, and use this string to generate all the sound file names.
- You can use the function openFile (from file.cpp) so you don't have to distinguish between upper and lower case file names.
- You don't need to test with extra path delimiter as it is added to sMAXPath earlier if missing.
This post has been edited 2 times. Last edit on Sep 02, 2008 1:10 pm by Eiko. ↑  ↓

#3 Sep 02, 2008 3:36 pm
beko beko Offline
Developer, Administrator
Registered since: Jun 04, 2004
Posts: 2,271


Subject: Re: Patches
Quote by shaktazuki:
My hours on IRC don't appear to coincide with yours.
Naw.. at 8 o' clock in the morning we usually work (students excluded) Wink
Bernd Kosmahl
"Sir, we are surrounded!" - "Great - we can attack in any direction."
↑  ↓

#4 Sep 02, 2008 3:48 pm
shaktazuki Offline
Mitglied
Registered since: Apr 30, 2008
Posts: 123


Subject: Re: Patches
Quote by Eiko:

- Duplicating all the wav related functions is not the best way to go. Generally duplicating code should be avoided. you could use a string to store the wave file extension. Set the string to .wav or .spw, depending on the tests, and use this string to generate all the sound file names.
I thought of that too. It was easier at the time to just do a search and replace on ".WAV" to ".SPW".

Quote:

- You can use the function openFile (from file.cpp) so you don't have to distinguish between upper and lower case file names.
- You don't need to test with extra path delimiter as it is added to sMAXPath earlier if missing.

I just followed the example of the language test, where both of those were done... sorry!
Embarrassing

What is to be done now?
This post has been edited 1 times. Last edit on Sep 02, 2008 3:55 pm by shaktazuki. ↑  ↓

#5 Sep 02, 2008 4:53 pm
Eiko Eiko Offline
Moderator, Developer
Registered since: Aug 03, 2007
Posts: 604


Subject: Re: Patches
Quote by beko:
Quote by shaktazuki:
My hours on IRC don't appear to coincide with yours.
Naw.. at 8 o' clock in the morning we usually work (students excluded) Wink

correct, I am in bed at that time Laughing

Quote by shaktazuki:
[
I just followed the example of the language test, where both of those were done... sorry!
Embarrassing

I didn't say, that I did no unnecessary checks Wink I noticed that today morning.

with a single 'openFile( sMAXPath + testFileName, "r");' you will know if there are .WAV files in the MAX folder or the ones with the other extension.

But that doesn't greatly matter. More important is the duplicate code. Please provide a version without it, and I'll be glad to commit the patch.
This post has been edited 3 times. Last edit on Sep 02, 2008 6:18 pm by Eiko. ↑  ↓

#6 Sep 03, 2008 1:52 am
shaktazuki Offline
Mitglied
Registered since: Apr 30, 2008
Posts: 123


Subject: Re: Patches
1st - you are aware that to do that I will have to entirely rework the sound installation functions?

But ok!

Also, SVN reports a problem with the updated english language pack - it has an exclamation point icon on it. What is that?
↑  ↓

#7 Sep 03, 2008 6:32 am
beko beko Offline
Developer, Administrator
Registered since: Jun 04, 2004
Posts: 2,271


Subject: Re: Patches
probably a conflict with your local version. you worked on your local file and svn detects that. now it gets a newer version from svn so it ends up showing you a conflict. you can

a.) undo local changes to get a fresh file from svn
b.) merge svn version with your version and get a new file that you should send to us again
Bernd Kosmahl
"Sir, we are surrounded!" - "Great - we can attack in any direction."
↑  ↓

#8 Sep 03, 2008 8:16 am
shaktazuki Offline
Mitglied
Registered since: Apr 30, 2008
Posts: 123


Subject: Re: Patches
Or,

C) delete your file and reupdate!

Wink

Here's a new patch for the language pack. Two minor changes.

Attachments:
File Type Information for: zip  lang_eng.zip
Downloads: 214
Filesize: 1.33 KB

↑  ↓

#9 Sep 03, 2008 11:33 am
Eiko Eiko Offline
Moderator, Developer
Registered since: Aug 03, 2007
Posts: 604


Subject: Re: Patches
language file update is checked in. Thanks Smiling

hm, what do you mean with "entirely rework the sound installation functions"? I though of just replacing all ".wav" by "+ waveExtension".
↑  ↓

#10 Sep 03, 2008 4:11 pm
shaktazuki Offline
Mitglied
Registered since: Apr 30, 2008
Posts: 123


Subject: Re: Patches
Yes, that's changing every sound file name for each time it is passed as a parameter... well, we'll see how it goes. I have a plan.
↑  ↓

Pages (2): 1, 2


All times are GMT +02:00. Current time: 5:56 pm.