X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ftopblock.c;h=7acd30a63597ce149fc81e5400e38eb738b9a76a;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=ef3ca0623206e398a7b2527517e3a69dd36c0252;hpb=f0261d8acab611f3433160e4f07367b870439739;p=xscreensaver diff --git a/hacks/glx/topblock.c b/hacks/glx/topblock.c index ef3ca062..7acd30a6 100644 --- 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) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } + if (!tbs) abort(); } 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)); - 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}; @@ -576,16 +568,18 @@ static void generateNewBlock(ModeInfo *mi) 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 { - 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 */ }