599ac9dee0
Previously, valptridx used PREFIX for allow-invalid+mutable, c#PREFIX for allow-invalid+const, v#PREFIX for require-valid+mutable, vc#PREFIX for require-valid+const. Convert the types, factories, and all usage sites to specify a qualifier for all four combinations: im#PREFIX -> allow-invalid+mutable ic#PREFIX -> allow-invalid+const vm#PREFIX -> require-valid+mutable vc#PREFIX -> require-valid+const Changes to common/include/valptridx.h and common/include/fwd-valptridx.h are manual. All other changes are generated by: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\(v\?\)\(\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/\1m\2/g' for the 'm' prefix and: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\([cm]\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/i&/g' for the 'i' prefix.
47 lines
1.1 KiB
C++
47 lines
1.1 KiB
C++
/*
|
|
* This file is part of the DXX-Rebirth project <http://www.dxx-rebirth.com/>.
|
|
* It is copyright by its individual contributors, as recorded in the
|
|
* project's Git history. See COPYING.txt at the top level for license
|
|
* terms and a link to the Git history.
|
|
*/
|
|
/*
|
|
*
|
|
* Header for escort.c
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "maths.h"
|
|
|
|
#ifdef __cplusplus
|
|
#include "fwd-object.h"
|
|
|
|
#ifdef dsx
|
|
namespace dsx {
|
|
#if defined(DXX_BUILD_DESCENT_I)
|
|
static inline void invalidate_escort_goal(void)
|
|
{
|
|
}
|
|
static inline void detect_escort_goal_accomplished(const vmobjptridx_t &)
|
|
{
|
|
}
|
|
static inline void drop_stolen_items (const vcobjptr_t &) {}
|
|
#elif defined(DXX_BUILD_DESCENT_II)
|
|
#define GUIDEBOT_NAME_LEN 9
|
|
extern void change_guidebot_name(void);
|
|
extern void do_escort_menu(void);
|
|
void detect_escort_goal_accomplished(vmobjptridx_t index);
|
|
void detect_escort_goal_fuelcen_accomplished();
|
|
extern void set_escort_special_goal(int key);
|
|
void recreate_thief(uint8_t thief_id);
|
|
void init_buddy_for_level(void);
|
|
void invalidate_escort_goal(void);
|
|
void drop_stolen_items (vcobjptr_t);
|
|
extern fix64 Buddy_sorry_time;
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
#endif
|