projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz
[xscreensaver]
/
hacks
/
glx
/
topblock.c
diff --git
a/hacks/glx/topblock.c
b/hacks/glx/topblock.c
index ef3ca0623206e398a7b2527517e3a69dd36c0252..7acd30a63597ce149fc81e5400e38eb738b9a76a 100644
(file)
--- a/
hacks/glx/topblock.c
+++ b/
hacks/glx/topblock.c
@@
-189,10
+189,7
@@
init_topBlock (ModeInfo *mi)
if (!tbs) {
tbs = (topBlockSTATE *)
calloc (MI_NUM_SCREENS(mi), sizeof (topBlockSTATE));
if (!tbs) {
tbs = (topBlockSTATE *)
calloc (MI_NUM_SCREENS(mi), sizeof (topBlockSTATE));
- if (!tbs) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
+ if (!tbs) abort();
}
tb = &tbs[MI_SCREEN(mi)];
}
tb = &tbs[MI_SCREEN(mi)];
@@
-232,11
+229,6
@@
init_topBlock (ModeInfo *mi)
dropSpeed = (blockHeight/dropSpeed);
reshape_topBlock (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
dropSpeed = (blockHeight/dropSpeed);
reshape_topBlock (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
- if (0==1) {
- glClearColor(1.0f, 1.0f, 1.0f, 0.5f);
- } else {
- glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
- }
glClearDepth(1.0f);
if (!wire) {
GLfloat pos[4] = {10.0, 10.0, 1.0, 0.0};
glClearDepth(1.0f);
if (!wire) {
GLfloat pos[4] = {10.0, 10.0, 1.0, 0.0};
@@
-576,16
+568,18
@@
static void generateNewBlock(ModeInfo *mi)
tb->numFallingBlocks++;
llTail = tb->blockNodeRoot;
if (llTail == NULL) {
tb->numFallingBlocks++;
llTail = tb->blockNodeRoot;
if (llTail == NULL) {
- if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) { fprintf(stderr, "%s: out of memory.\n", progname); }
- llTail = llCurrent;
- tb->blockNodeRoot = llCurrent;
+ llCurrent = ((NODE*) malloc(sizeof(NODE)));
+ if (!llCurrent) abort();
+ llTail = llCurrent;
+ tb->blockNodeRoot = llCurrent;
} else {
if (tb->numFallingBlocks>=maxFalling) {
/* recycle */
llCurrent=llTail->next;
tb->blockNodeRoot=llCurrent->next;
} else {
} else {
if (tb->numFallingBlocks>=maxFalling) {
/* recycle */
llCurrent=llTail->next;
tb->blockNodeRoot=llCurrent->next;
} else {
- if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) { fprintf(stderr, "%s: out of memory..\n", progname); }
+ llCurrent = ((NODE*) malloc(sizeof(NODE)));
+ if (!llCurrent) abort();
}
while (llTail->next != NULL) { llTail = llTail->next; } /* find last item in list */
}
}
while (llTail->next != NULL) { llTail = llTail->next; } /* find last item in list */
}