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.

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

Jump to bottom

Fix serverinfo overflow - reduce version cvar #31

Merged
merged 2 commits into from
Apr 10, 2018
Merged

Fix serverinfo overflow - reduce version cvar #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa5cdc
Fix serverinfo overflow - reduce version cvar
ThomasBrierley Apr 5, 2018
ca200e4
Fixed typo.
BidyBiddle Apr 10, 2018
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ endif
export CROSS_COMPILING

ifndef VERSION
VERSION=ioq3urt-mickael9
VERSION=m9
endif

ifndef CLIENTBIN
Expand Down Expand Up @@ -288,9 +288,9 @@ endif
# Add git version info
USE_GIT=
ifeq ($(wildcard .git),.git)
GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
GIT_REV=$(shell git describe --always)
ifneq ($(GIT_REV),)
VERSION:=$(VERSION)_GIT_$(GIT_REV)
VERSION:=$(VERSION)-$(GIT_REV)
USE_GIT=1
endif
endif
Expand Down
4 changes: 2 additions & 2 deletions code/qcommon/q_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file

#define PRODUCT_NAME "ioQuake3-UrT"
#define PRODUCT_NAME "ioq3-UrT"
#define BASEGAME "q3ut4"
#define CLIENT_WINDOW_TITLE "UrbanTerror"
#define CLIENT_WINDOW_MIN_TITLE "UrbanTerror"
Expand Down Expand Up @@ -474,7 +474,7 @@ int Q_isnan(float x);
#endif
/*
// if your system does not have lrintf() and round() you can try this block. Please also open a bug report at bugzilla.icculus.org
// or write a mail to the ioq3 mailing list.
// or write a mail to the 3 mailing list.
Copy link
Owner

Choose a reason for hiding this comment

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

oops

Copy link
Collaborator

Choose a reason for hiding this comment

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

He didn't fix the typo, did he? 😄

Copy link
Author

Choose a reason for hiding this comment

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

Ya this might be getting too terse :P

Copy link
Collaborator

@BidyBiddle BidyBiddle Apr 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Oh snap, dunno how that ioq3 changed into a 3. Must have been a fail when searching all the ioq3 occurences.

Copy link

Choose a reason for hiding this comment

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

Darn regexp failures 😄

#else
#define Q_ftol(v) ((long) (v))
#define Q_round(v) do { if((v) < 0) (v) -= 0.5f; else (v) += 0.5f; (v) = Q_ftol((v)); } while(0)
Expand Down