Cube  Diff

Differences From Artifact [ce8dd423e7]:

• File src/weapon.cxx — part of check-in [0a0d4f9155] at 2024-07-20 15:08:41 on branch trunk — Run clang-format on the entire codebase (user: js, size: 9017) [annotate] [blame] [check-ins using]
• File src/weapon.mm — part of check-in [7c2704b3d7] at 2024-07-21 12:02:07 on branch trunk — Convert to ObjC++ (user: js, size: 9017) [annotate] [blame] [check-ins using]

To Artifact [2770740083]:

• File src/weapon.mm — part of check-in [f8f97851f3] at 2024-08-03 17:02:33 on branch trunk — Make conoutf take an OFString (user: js, size: 9018) [annotate] [blame] [check-ins using]

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

	else if (s != GUN_RIFLE && player1->ammo[GUN_RIFLE])
		s = GUN_RIFLE;
	else
		s = GUN_FIST;
	if (s != player1->gunselect)
		playsoundc(S_WEAPLOAD);
	player1->gunselect = s;
	// conoutf("%s selected", (int)guns[s].name);
};

int
reloadtime(int gun)
{
	return guns[gun].attackdelay;
};

|

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

	else if (s != GUN_RIFLE && player1->ammo[GUN_RIFLE])
		s = GUN_RIFLE;
	else
		s = GUN_FIST;
	if (s != player1->gunselect)
		playsoundc(S_WEAPLOAD);
	player1->gunselect = s;
	// conoutf(@"%s selected", (int)guns[s].name);
};

int
reloadtime(int gun)
{
	return guns[gun].attackdelay;
};