Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup more use of the "long" data type. #1012

Merged
merged 2 commits into from
Jun 26, 2024

Conversation

OmniBlade
Copy link
Contributor

This datatype varies in length between platforms so its use is not portable.

redalert/conquer.cpp Outdated Show resolved Hide resolved
redalert/conquer.cpp Outdated Show resolved Hide resolved
redalert/jshell.cpp Outdated Show resolved Hide resolved
redalert/netdlg.cpp Outdated Show resolved Hide resolved
tiberiandawn/jshell.cpp Outdated Show resolved Hide resolved
tiberiandawn/logic.cpp Outdated Show resolved Hide resolved
@giulianobelinassi
Copy link
Collaborator

There are changes which seems to have been done by mistake automatically by your text editor.

@OmniBlade
Copy link
Contributor Author

Should all be cleaned up now.

redalert/conquer.cpp Outdated Show resolved Hide resolved
redalert/dllinterface.cpp Outdated Show resolved Hide resolved
tiberiandawn/aircraft.cpp Outdated Show resolved Hide resolved
tiberiandawn/function.h Outdated Show resolved Hide resolved
tiberiandawn/function.h Outdated Show resolved Hide resolved
tiberiandawn/function.h Outdated Show resolved Hide resolved
tiberiandawn/function.h Outdated Show resolved Hide resolved
tiberiandawn/function.h Outdated Show resolved Hide resolved
@OmniBlade
Copy link
Contributor Author

Aw man, that stupid utf conversion :D

@OmniBlade OmniBlade force-pushed the cleanup/morelong branch 2 times, most recently from 3c91025 to b477720 Compare June 25, 2024 08:52
@OmniBlade
Copy link
Contributor Author

Okay, really should be cleaned up this time @giulianobelinassi

@@ -4257,7 +4257,7 @@ bool Force_CD_Available(int cd)
#endif

#ifdef FRENCH
sprintf(buffer, "Ins�rez le %s", _cd_name[cd]);
sprintf(buffer, "Ins�rez le %s", _cd_name[cd]);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mistake change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these are actually fixing a change that went through incorrectly previously.

@@ -4268,7 +4268,7 @@ bool Force_CD_Available(int cd)
} else {
#ifdef DVD
#ifdef FRENCH
sprintf(buffer, "Ins�rez le %s", _cd_name[4]);
sprintf(buffer, "Ins�rez le %s", _cd_name[4]);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mistake change

This datatype varies in length between platforms so its use is not portable.
@OmniBlade OmniBlade merged commit dbfebf3 into TheAssemblyArmada:vanilla Jun 26, 2024
17 checks passed
@OmniBlade OmniBlade deleted the cleanup/morelong branch June 26, 2024 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants