From e5923955ef45b1e1079b238fe69e066e148d8b0f Mon Sep 17 00:00:00 2001 From: helixhorned Date: Fri, 7 Nov 2014 22:07:14 +0000 Subject: [PATCH] Fix C++ build. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4737 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/osd.h | 2 +- polymer/eduke32/source/lunatic/doc/lunatic.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/include/osd.h b/polymer/eduke32/build/include/osd.h index 6493c24d4..5620315f4 100644 --- a/polymer/eduke32/build/include/osd.h +++ b/polymer/eduke32/build/include/osd.h @@ -276,7 +276,7 @@ void OSD_WriteCvars(FILE *fp); static inline void OSD_SetHistory(int32_t histIdx, const char *src) { - osd->history.buf[histIdx] = Xmalloc(OSDEDITLENGTH); + osd->history.buf[histIdx] = (char *)Xmalloc(OSDEDITLENGTH); Bstrncpyz(osd->history.buf[histIdx], src, OSDEDITLENGTH); } diff --git a/polymer/eduke32/source/lunatic/doc/lunatic.txt b/polymer/eduke32/source/lunatic/doc/lunatic.txt index cf6bedb6a..52e6d7c0b 100644 --- a/polymer/eduke32/source/lunatic/doc/lunatic.txt +++ b/polymer/eduke32/source/lunatic/doc/lunatic.txt @@ -510,7 +510,7 @@ number from 0 to 2^_B_^--1. 4. If the truncated value is outside the range of representable values for the corresponding integer type of bit width _B_, the final value is obtained by - successively adding or subtracting 2^B^, until the value falls inside that + successively adding or subtracting 2^_B_^, until the value falls inside that range. ////////// @@ -989,8 +989,8 @@ Returns the result of the `updatesector` call. [[sprite_power]] `spr^zofs`:: Returns an <> object that contains the position of this sprite, diminished by `zofs` in the z direction. Because in BUILD, z -coordinates increase toward the floor, the `^` can be thought of as ``raise the -sprite by `zofs` units''. +coordinates increase toward the floor, the `^` can be thought of as the +position of the sprite ``raised by `zofs` units''. ===== `sprite` static data