Skip to content

Remove assumptions about the width of long and of pointers #154

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.

Sign up for GitHub

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

Merged
ZivDero merged 3 commits into from
Sep 11, 2026
+5 −4
Merged

Remove assumptions about the width of long and of pointers #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40d6835
Take the dissolve alpha minimum in DWORD rather than unsigned long
gunnarbeutner Sep 10, 2026
c40d9eb
Pin the trigger action's Value field to a fixed width
gunnarbeutner Sep 10, 2026
df2212c
Format the generated type name the way MSVC's %p does
gunnarbeutner Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/abstype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "savestream.h"
#include "vector.h"

#include <cinttypes>
#include <cstdio>


Expand All @@ -47,8 +48,8 @@ AbstractTypeClass::AbstractTypeClass(char const * ininame) :
GivenName()
{
if (ininame == NULL) {
char pstr[24];
sprintf(pstr, "%p", (void *)this);
char pstr[2 * sizeof(void *) + 1];
sprintf(pstr, "%0*" PRIXPTR, (int)(2 * sizeof(void *)), (uintptr_t)this);
IniName = TStringID<24>(pstr);
} else {
IniName = TStringID<24>(ininame);
Expand Down
2 changes: 1 addition & 1 deletion code/dropship.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ void Dropship_Screen(void)
--j;
}

int alpha = std::min(255ul, (_dissolve_rate * timeGetTime() - _dissolve_rate * effect->StartTime) / _dissolve_scale);
int alpha = std::min<DWORD>(255, (_dissolve_rate * timeGetTime() - _dissolve_rate * effect->StartTime) / _dissolve_scale);

if (alpha != effect->Alpha || overlap_drawn) {
effect->Alpha = alpha;
Expand Down
2 changes: 1 addition & 1 deletion code/taction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class TActionClass : public AbstractClass
VoxelAnimType VAnim;
CrateType Crate;
bool Bool; // Boolean value.
long Value;
int Value;
Comment thread
gunnarbeutner marked this conversation as resolved.
float Float;
} Data;

Expand Down
Loading